diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:51:17 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:51:17 +0000 |
| commit | ffabb1ea75e662308da91e916a0ffc922525aa18 (patch) | |
| tree | 788b1ac84169a936b02d10feda6c94efaee129ea /content/shell/shell_aura.cc | |
| parent | c856e976800426511cd1a0f74d38c1fa7c883018 (diff) | |
| download | chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.zip chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.tar.gz chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.tar.bz2 | |
Makes gfx::Screen an instance, rather than a collection of static methods.
This is in support of supporting separate Screen implementations on Aura for desktop and metro on Windows.
Some callsites are not yet correct, and noted with a reference to the http://crbug.com/133312. As-is those sites will behave the same as before this patch, but may not be correct once desktop/metro can run simultaneously.
BUG=133312
Review URL: https://chromiumcodereview.appspot.com/11030017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_aura.cc')
| -rw-r--r-- | content/shell/shell_aura.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc index ebbd75e..7e1a1e8 100644 --- a/content/shell/shell_aura.cc +++ b/content/shell/shell_aura.cc @@ -289,7 +289,8 @@ void Shell::PlatformInitialize() { #endif aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager); stacking_client_ = new aura::DesktopStackingClient(); - gfx::Screen::SetInstance(aura::CreateDesktopScreen()); + gfx::Screen::SetScreenInstance( + gfx::SCREEN_TYPE_NATIVE, aura::CreateDesktopScreen()); views_delegate_ = new ShellViewsDelegateAura(); CommandLine::ForCurrentProcess()->AppendSwitch(views::switches::kDesktopAura); |