trunk/src/ash/shell.h - 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.h

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.h

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

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

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

@@ -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 @@

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 @@

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

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