ash/system/tray/tray_background_view.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/system/tray/tray_background_view.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/system/tray/tray_background_view.cc

diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc

index b106122dd608c8a4aa6704ae2877b0fc5ffb36e6..f357706430dd2df67d4a737a06b76f55452a73e2 100644

--- a/ash/system/tray/tray_background_view.cc

+++ b/ash/system/tray/tray_background_view.cc

@@ -573,7 +573,7 @@ gfx::Rect TrayBackgroundView::GetBubbleAnchorRect(

// TODO(jennyz): May need to add left/right alignment in the following code.

if (rect.IsEmpty()) {

- aura::RootWindow* target_root = anchor_widget ?

+ aura::Window* target_root = anchor_widget ?

anchor_widget->GetNativeView()->GetRootWindow() :

Shell::GetPrimaryRootWindow();

rect = target_root->bounds();

@@ -622,7 +622,7 @@ void TrayBackgroundView::UpdateBubbleViewArrow(

if (switches::UseAlternateShelfLayout())

return;

- aura::RootWindow* root_window =

+ aura::Window* root_window =

bubble_view->GetWidget()->GetNativeView()->GetRootWindow();

ash::internal::ShelfLayoutManager* shelf =

ShelfLayoutManager::ForLauncher(root_window);