diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 16:18:53 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 16:18:53 +0000 |
| commit | ecca62bd54f6e04c8c96284b3a726f29af6badc0 (patch) | |
| tree | cfd9cb892b7020fe9b9f1ea3544545cf9180b8df /chrome_frame/test | |
| parent | d6066a8faa902dd9dec2889bf83a7cc755e30686 (diff) | |
| download | chromium_src-ecca62bd54f6e04c8c96284b3a726f29af6badc0.zip chromium_src-ecca62bd54f6e04c8c96284b3a726f29af6badc0.tar.gz chromium_src-ecca62bd54f6e04c8c96284b3a726f29af6badc0.tar.bz2 | |
Explicit initialization of aura::Env for browser shell.
Most implementations (x11 aura with and without chromeos) do not explicitly
call aura::Env::GetInstance() to initialize it. These build work as is because
the call is done when performing other operations, such as adding observers.
In OZONE there are no such calls, so the OZONE build fails when trying to
create a compositor since the Compositor::Initialize hasn't been called.
This patch adds an explicit initialization for aura based builds to fix this
issue.
BUG=
Review URL: https://codereview.chromium.org/23882007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227745 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index bcc7792..935b02c 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -75,6 +75,7 @@ #include "ui/base/ui_base_paths.h" #if defined(USE_AURA) +#include "ui/aura/env.h" #include "ui/gfx/screen.h" #include "ui/views/widget/desktop_aura/desktop_screen.h" #endif @@ -553,6 +554,7 @@ void FakeExternalTab::Initialize() { void FakeExternalTab::InitializePostThreadsCreated() { #if defined(USE_AURA) + aura::Env::CreateInstance(); gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen()); #endif |