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.cc | |
| 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.cc')
| -rw-r--r-- | ash/shell.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 67b7cab..ab63478 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -223,7 +223,7 @@ gfx::Screen* Shell::GetScreen() { } // static -aura::Window::Windows Shell::GetAllRootWindows() { +Shell::RootWindowList Shell::GetAllRootWindows() { return Shell::GetInstance()->display_controller()-> GetAllRootWindows(); } @@ -245,8 +245,8 @@ std::vector<aura::Window*> Shell::GetContainersFromAllRootWindows( int container_id, aura::Window* priority_root) { std::vector<aura::Window*> containers; - aura::Window::Windows root_windows = GetAllRootWindows(); - for (aura::Window::Windows::const_iterator it = root_windows.begin(); + RootWindowList root_windows = GetAllRootWindows(); + for (RootWindowList::const_iterator it = root_windows.begin(); it != root_windows.end(); ++it) { aura::Window* container = (*it)->GetChildById(container_id); if (container) { |