From da5f8416ed613f5ad51a70eaae20f11562db0a3e Mon Sep 17 00:00:00 2001
From: "sadrul@chromium.org"
<sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 23 Apr 2014 17:42:00 +0000
Subject: aura: Initialize Env as early as possible.
Initialize the aura environment as part of initializing the toolkit in
BrowserMainLoop::InitializeToolkit. Change all the other places that
tries to initialize aura::Env to instead assert that aura::Env has
already been initialized. With this change, the initialization of
aura::Env happens in the same place on all aura platforms.
BUG=365947
R=jochen@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/248503003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265679 0039d316-1c4b-4281-b951-d872f2087c98
---
content/shell/browser/shell_platform_data_aura.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'content/shell')
diff --git a/content/shell/browser/shell_platform_data_aura.cc b/content/shell/browser/shell_platform_data_aura.cc
index fdbf634..0a63279 100644
--- a/content/shell/browser/shell_platform_data_aura.cc
+++ b/content/shell/browser/shell_platform_data_aura.cc
@@ -113,7 +113,7 @@ class MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
ShellPlatformDataAura* Shell::platform_ = NULL;
ShellPlatformDataAura::ShellPlatformDataAura(const gfx::Size& initial_size) {
- aura::Env::CreateInstance();
+ CHECK(aura::Env::GetInstance());
host_.reset(aura::WindowTreeHost::Create(gfx::Rect(initial_size)));
host_->InitHost();
host_->window()->SetLayoutManager(new FillLayout(host_->window()));
--
cgit v1.1