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/root_window_controller.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/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 9c6580a..543a084 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -26,7 +26,6 @@ #include "ash/wm/root_window_layout_manager.h" #include "ash/wm/screen_dimmer.h" #include "ash/wm/shelf_layout_manager.h" -#include "ash/wm/stacking_controller.h" #include "ash/wm/status_area_layout_manager.h" #include "ash/wm/system_background_controller.h" #include "ash/wm/system_modal_container_layout_manager.h" @@ -169,9 +168,6 @@ RootWindowController::RootWindowController(aura::RootWindow* root_window) panel_layout_manager_(NULL) { SetRootWindowController(root_window, this); screen_dimmer_.reset(new ScreenDimmer(root_window)); - - stacking_controller_.reset(new ash::StackingController); - aura::client::SetStackingClient(root_window, stacking_controller_.get()); } RootWindowController::~RootWindowController() { |