No more need to init aura::Env.

This commit is contained in:
Cheng Zhao 2014-07-27 10:32:09 +00:00
parent 6dd580526e
commit bb87492897

View file

@ -9,7 +9,6 @@
#include "net/proxy/proxy_resolver_v8.h" #include "net/proxy/proxy_resolver_v8.h"
#if defined(USE_AURA) #if defined(USE_AURA)
#include "ui/aura/env.h"
#include "ui/gfx/screen.h" #include "ui/gfx/screen.h"
#include "ui/views/widget/desktop_aura/desktop_screen.h" #include "ui/views/widget/desktop_aura/desktop_screen.h"
#endif #endif
@ -97,14 +96,10 @@ void BrowserMainParts::PreMainMessageLoopRun() {
void BrowserMainParts::PostMainMessageLoopRun() { void BrowserMainParts::PostMainMessageLoopRun() {
browser_context_.reset(); browser_context_.reset();
#if defined(USE_AURA)
aura::Env::DeleteInstance();
#endif
} }
int BrowserMainParts::PreCreateThreads() { int BrowserMainParts::PreCreateThreads() {
#if defined(USE_AURA) #if defined(USE_AURA)
aura::Env::CreateInstance();
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
views::CreateDesktopScreen()); views::CreateDesktopScreen());
#endif #endif