diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 18:39:46 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 18:39:46 +0000 |
| commit | 42286187ce93cbbf7b291d4719bc7d2fd27fc583 (patch) | |
| tree | be23602963a9ea1e1b9e3ef35c33f18f9ebe1495 /ash/shell | |
| parent | 76297d2792b44dc5e0b2f5fad488acf815f7813f (diff) | |
| download | chromium_src-42286187ce93cbbf7b291d4719bc7d2fd27fc583.zip chromium_src-42286187ce93cbbf7b291d4719bc7d2fd27fc583.tar.gz chromium_src-42286187ce93cbbf7b291d4719bc7d2fd27fc583.tar.bz2 | |
reland of https://codereview.chromium.org/11364053/
Two changes from that CL:
- Don't remove per-RootWindow StackingClient (erg thought he probably needed it; if not I can remove it later in a separate CL)
- Fix initialization in Shell::PlatformInitialize (wasn't initializing correctly in the CrOS case), diff between ps1 and ps2 in content/shell/shell_aura.cc
TBR=ben@chromium.org
BUG=128578
Review URL: https://codereview.chromium.org/11362216
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/shell_delegate_impl.cc | 4 | ||||
| -rw-r--r-- | ash/shell/shell_delegate_impl.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 380af07..206a476 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -173,5 +173,9 @@ ui::MenuModel* ShellDelegateImpl::CreateContextMenu(aura::RootWindow* root) { return new ContextMenu(root); } +aura::client::StackingClient* ShellDelegateImpl::CreateStackingClient() { + return NULL; +} + } // namespace shell } // namespace ash 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. |