trunk/src/ash/shell.cc - Issue 59153004: Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/ash/shell.cc

Issue 59153004: Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: trunk/src/ash/shell.cc

===================================================================

--- trunk/src/ash/shell.cc (revision 233812)

+++ trunk/src/ash/shell.cc (working copy)

@@ -223,7 +223,7 @@

}

// static

-aura::Window::Windows Shell::GetAllRootWindows() {

+Shell::RootWindowList Shell::GetAllRootWindows() {

return Shell::GetInstance()->display_controller()->

GetAllRootWindows();

}

@@ -245,8 +245,8 @@

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) {

« no previous file with comments | « trunk/src/ash/shell.h ('k') | trunk/src/ash/shell/window_watcher.cc » ('j') | no next file with comments »