diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 09:49:21 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 09:49:21 +0000 |
| commit | be0dd0538390c16089305cb24b7e9ebf1eba3e1a (patch) | |
| tree | 2c482f3c0a926b438f2b653074feb840bcede80e | |
| parent | 21827884637cbc9bee867181fdc7140436f7d92e (diff) | |
| download | chromium_src-be0dd0538390c16089305cb24b7e9ebf1eba3e1a.zip chromium_src-be0dd0538390c16089305cb24b7e9ebf1eba3e1a.tar.gz chromium_src-be0dd0538390c16089305cb24b7e9ebf1eba3e1a.tar.bz2 | |
Create the desktop screen in the CF net tests.
This is needed for the Chrome Frame net tests to run under Aura.
BUG=none
R=robertshield@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18591003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209940 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 13f3c45..f67baaf 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -73,6 +73,11 @@ #include "ui/base/resource/resource_bundle_win.h" #include "ui/base/ui_base_paths.h" +#if defined(USE_AURA) +#include "ui/gfx/screen.h" +#include "ui/views/widget/desktop_aura/desktop_screen.h" +#endif + using content::BrowserThread; namespace { @@ -539,6 +544,10 @@ void FakeExternalTab::Initialize() { } void FakeExternalTab::InitializePostThreadsCreated() { +#if defined(USE_AURA) + gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, + views::CreateDesktopScreen()); +#endif base::FilePath profile_path( ProfileManager::GetDefaultProfileDir(user_data())); Profile* profile = |