diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 07:16:24 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 07:16:24 +0000 |
| commit | 8d25881d44dd6ad0d64499c3873d2800f1c777c7 (patch) | |
| tree | 23df296f56203c0981a006b75292bcc02ebb7c48 /ash/shell.h | |
| parent | 4d5cefef845b8d09c6707ec91207b87363898ab7 (diff) | |
| download | chromium_src-8d25881d44dd6ad0d64499c3873d2800f1c777c7.zip chromium_src-8d25881d44dd6ad0d64499c3873d2800f1c777c7.tar.gz chromium_src-8d25881d44dd6ad0d64499c3873d2800f1c777c7.tar.bz2 | |
Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..."
> Eliminate Shell::RootWindowList in favor of aura::Window::Windows.
>
> This is necessary as part of my plan to rework RootWindow, specifically making it not be a subclass of Window. (It will eventually be renamed WindowEventDispatcher). Code that expected to get the RootWindow interface from this type can still call GetDispatcher() on members of the returned vector of Windows.
>
> R=oshima@chromium.org
> http://crbug.com/308843
>
> Review URL: https://codereview.chromium.org/64933002
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/59153004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell.h b/ash/shell.h index 4df19fc..fb4dd08c 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -19,7 +19,6 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "ui/aura/client/activation_change_observer.h" -#include "ui/aura/window.h" #include "ui/base/ui_base_types.h" #include "ui/events/event_target.h" #include "ui/gfx/insets.h" @@ -166,6 +165,7 @@ class ASH_EXPORT Shell public ui::EventTarget, public aura::client::ActivationChangeObserver { public: + typedef std::vector<aura::RootWindow*> RootWindowList; typedef std::vector<internal::RootWindowController*> RootWindowControllerList; enum Direction { @@ -209,7 +209,7 @@ class ASH_EXPORT Shell static gfx::Screen* GetScreen(); // Returns all root windows. - static aura::Window::Windows GetAllRootWindows(); + static RootWindowList GetAllRootWindows(); static aura::Window* GetContainer(aura::Window* root_window, int container_id); |