summaryrefslogtreecommitdiffstats
path: root/ash/shell_delegate.h
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-22 20:50:36 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-22 20:50:36 +0000
commit2a2caa0c24fb2adb2a889d24c85f120f55efac52 (patch)
tree40f6803189fb0bbdb7af69c114377b8ae448d99b /ash/shell_delegate.h
parentf47621b16b748a2cb828e2f28b39f717c48ab65d (diff)
downloadchromium_src-2a2caa0c24fb2adb2a889d24c85f120f55efac52.zip
chromium_src-2a2caa0c24fb2adb2a889d24c85f120f55efac52.tar.gz
chromium_src-2a2caa0c24fb2adb2a889d24c85f120f55efac52.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. - Because of that, added a few of NULL checking to RenderWidgetHostViewAura. (Other methods NULL checked Window::GetRootWindow(), but there were a few that didn't and relied on the old NULL means lookup in the StackingClient behaviour.) BUG=161882 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=177182 Review URL: https://codereview.chromium.org/11829040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_delegate.h')
-rw-r--r--ash/shell_delegate.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 6a9dd08..11482d5 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -22,7 +22,6 @@ namespace aura {
class RootWindow;
class Window;
namespace client {
-class StackingClient;
class UserActionClient;
}
}
@@ -219,9 +218,6 @@ class ASH_EXPORT ShellDelegate {
// Creates a menu model of the context for the |root_window|.
virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root_window) = 0;
- // Creates the stacking client. Shell takes ownership of the object.
- virtual aura::client::StackingClient* CreateStackingClient() = 0;
-
// Creates a root window host factory. Shell takes ownership of the returned
// value.
virtual RootWindowHostFactory* CreateRootWindowHostFactory() = 0;