ash/shelf/shelf_alignment_menu.cc - 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_alignment_menu.cc

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_alignment_menu.cc

diff --git a/ash/shelf/shelf_alignment_menu.cc b/ash/shelf/shelf_alignment_menu.cc

index d0d381ff645af649c2823db3f30cb5cd9aad6515..722b053ce479811475c7b40b114e029f65a4b89b 100644

--- a/ash/shelf/shelf_alignment_menu.cc

+++ b/ash/shelf/shelf_alignment_menu.cc

@@ -8,12 +8,12 @@

#include "ash/shelf/shelf_types.h"

#include "ash/shell.h"

#include "grit/ash_strings.h"

-#include "ui/aura/root_window.h"

+#include "ui/aura/window.h"

#include "ui/base/l10n/l10n_util.h"

namespace ash {

-ShelfAlignmentMenu::ShelfAlignmentMenu(aura::RootWindow* root)

+ShelfAlignmentMenu::ShelfAlignmentMenu(aura::Window* root)

: ui::SimpleMenuModel(NULL),

root_window_(root) {

DCHECK(root_window_);