diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 22:56:25 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 22:56:25 +0000 |
| commit | 04925978d28ec771c89fb9fab52b89e592d68f20 (patch) | |
| tree | 5c287ae2a6243ea108f12aaeb1b675a17dd14183 /content/shell/shell_aura.cc | |
| parent | b400c9082d1efdd734a92d906f2a0c9d80f70aa8 (diff) | |
| download | chromium_src-04925978d28ec771c89fb9fab52b89e592d68f20.zip chromium_src-04925978d28ec771c89fb9fab52b89e592d68f20.tar.gz chromium_src-04925978d28ec771c89fb9fab52b89e592d68f20.tar.bz2 | |
Revert 167245 - Currently, the ash and desktop implementations of StackingClient stomp each other in aura::Env. Instead:
- Don't have StackingClient implementations install themselves by default
- Add chrome implementation of StackingClient that dispatches to ash or desktop
- Pass extra |context| to GetDefaultParent (normally a RootWindow) that it can use to determine desktop type.
- Workaround a few locations by using ScopedForceDesktopType: in these locations, the GetHostDesktopForNative... functions fail because they're used during window creation when the windows have no parent (and so can't determine which desktop they're in).
- Remove window-specific StackingClient (unnecessary?)
BUG=128578
Review URL: https://codereview.chromium.org/11364053
TBR=scottmg@google.com
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_aura.cc')
| -rw-r--r-- | content/shell/shell_aura.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc index 16157b5..fa58914 100644 --- a/content/shell/shell_aura.cc +++ b/content/shell/shell_aura.cc @@ -290,7 +290,6 @@ void Shell::PlatformInitialize() { gfx::SCREEN_TYPE_NATIVE, new ash::ScreenAsh); #else stacking_client_ = new aura::DesktopStackingClient(); - aura::client::SetStackingClient(stacking_client_); gfx::Screen::SetScreenInstance( gfx::SCREEN_TYPE_NATIVE, aura::CreateDesktopScreen()); #endif |