diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 18:46:21 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 18:46:21 +0000 |
commit | 19ae46080bae6133eb1685922faaa234bf775805 (patch) | |
tree | 2a2d70df8a98e85622b4e1e993bcfea10570adc3 /ash/shell/shell_delegate_impl.cc | |
parent | 85ff2936cec8d4b942bf2f35ad6bfc6bb05385b6 (diff) | |
download | chromium_src-19ae46080bae6133eb1685922faaa234bf775805.zip chromium_src-19ae46080bae6133eb1685922faaa234bf775805.tar.gz chromium_src-19ae46080bae6133eb1685922faaa234bf775805.tar.bz2 |
Finally rip the global StackingClient bandaid off.
- Removes the aura::client::SetStackingClient(StackingClient*) interface.
- Moves the ash StackingController from a singleton owned by ash::Shell to one StackingController per RootWindow owned by the ash::RootWindowController. (Also removes a spurious delegate method, where every implementation creates the same object, including tests.)
- Removes the global DesktopStackingClient and related interfaces.
- Fix the ChromeViewsDelegate so that it still sets context in chromeos builds.
- Rename content::ShellStackingClientAsh to content::MinimalAsh to reflect what it really does.
In addition, the following fix ups apply:
- Previously, WebContentsViewAura asserted that it needed a context window. Now if no context window is provided, it isn't added to an aura hierarchy. There are times when that context doesn't exist: various chromeos dialogs that directly invoke WebView and toplevel extension/app windows that are created from background pages that don't have contexts.
BUG=161882
Review URL: https://codereview.chromium.org/11829040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/shell_delegate_impl.cc')
-rw-r--r-- | ash/shell/shell_delegate_impl.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 681dfb5..945fae9 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -11,7 +11,6 @@ #include "ash/shell/context_menu.h" #include "ash/shell/toplevel_window.h" #include "ash/shell_window_ids.h" -#include "ash/wm/stacking_controller.h" #include "ash/wm/window_util.h" #include "base/message_loop.h" #include "ui/aura/window.h" @@ -215,10 +214,6 @@ ui::MenuModel* ShellDelegateImpl::CreateContextMenu(aura::RootWindow* root) { return new ContextMenu(root); } -aura::client::StackingClient* ShellDelegateImpl::CreateStackingClient() { - return new StackingController; -} - RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() { return RootWindowHostFactory::Create(); } |