ash/shelf/shelf_layout_manager.h - Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow.

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: ash/shelf/shelf_layout_manager.h

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: First cut for review/trybots Created 7 years, 2 months 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: ash/shelf/shelf_layout_manager.h

diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h

index d8b6e8f699a155edbf784588a1cc6224a6b10d68..7c4e26edb5c27a30059c43e8503474935ada17f7 100644

--- a/ash/shelf/shelf_layout_manager.h

+++ b/ash/shelf/shelf_layout_manager.h

@@ -342,7 +342,7 @@ class ASH_EXPORT ShelfLayoutManager :

// The RootWindow is cached so that we don't invoke Shell::GetInstance() from

// our destructor. We avoid that as at the time we're deleted Shell is being

// deleted too.

- aura::RootWindow* root_window_;

+ aura::Window* root_window_;

// True when inside UpdateBoundsAndOpacity() method. Used to prevent calling

// UpdateBoundsAndOpacity() again from SetChildBounds().