diff options
| author | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 21:45:03 +0000 |
|---|---|---|
| committer | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 21:45:03 +0000 |
| commit | 2937cac67e61e1ee4d01dd1e7ecb4562be79005b (patch) | |
| tree | ace9d85dc3effec5b33656b9801b5bb317f73857 /ash/shell/shell_delegate_impl.h | |
| parent | 6c50bfb93535623550aeab906f2119610c28cb29 (diff) | |
| download | chromium_src-2937cac67e61e1ee4d01dd1e7ecb4562be79005b.zip chromium_src-2937cac67e61e1ee4d01dd1e7ecb4562be79005b.tar.gz chromium_src-2937cac67e61e1ee4d01dd1e7ecb4562be79005b.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/shell_delegate_impl.h')
| -rw-r--r-- | ash/shell/shell_delegate_impl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h index 987c7af..6f55237 100644 --- a/ash/shell/shell_delegate_impl.h +++ b/ash/shell/shell_delegate_impl.h @@ -59,6 +59,7 @@ class ShellDelegateImpl : public ash::ShellDelegate { virtual double GetSavedScreenMagnifierScale() OVERRIDE; virtual ui::MenuModel* CreateContextMenu( aura::RootWindow* root_window) OVERRIDE; + virtual aura::client::StackingClient* CreateStackingClient() OVERRIDE; private: // Used to update Launcher. Owned by main. |