diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 19:25:41 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 19:25:41 +0000 |
commit | 984522c27db175de6fc1835fb6ef2d4327aa7657 (patch) | |
tree | afcd1b6e5e459c82b5e7246da297fb74147903bf /ash/shell/shell_delegate_impl.cc | |
parent | c115677e34ec8c23b604570e546b1881091fbcf6 (diff) | |
download | chromium_src-984522c27db175de6fc1835fb6ef2d4327aa7657.zip chromium_src-984522c27db175de6fc1835fb6ef2d4327aa7657.tar.gz chromium_src-984522c27db175de6fc1835fb6ef2d4327aa7657.tar.bz2 |
Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure
> 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
TBR=erg@chromium.org
Review URL: https://codereview.chromium.org/11962021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177190 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, 5 insertions, 0 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 945fae9..681dfb5 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -11,6 +11,7 @@ #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" @@ -214,6 +215,10 @@ 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(); } |