chrome/browser/ui/ash/launcher/browser_status_monitor.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: chrome/browser/ui/ash/launcher/browser_status_monitor.cc

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

Patch Set: rebase 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: chrome/browser/ui/ash/launcher/browser_status_monitor.cc

diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

index a3a95e8b78b771d08effbbcb38aa8d0a415cad6c..43845faa0baf5d5305ff138c98874eed27d64783 100644

--- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

+++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

@@ -183,7 +183,7 @@ void BrowserStatusMonitor::OnDisplayBoundsChanged(

void BrowserStatusMonitor::OnDisplayAdded(const gfx::Display& new_display) {

// Add a new RootWindow and its ActivationClient to observed list.

- aura::RootWindow* root_window = ash::Shell::GetInstance()->

+ aura::Window* root_window = ash::Shell::GetInstance()->

display_controller()->GetRootWindowForDisplayId(new_display.id());

// When the primary root window's display get removed, the existing root

// window is taken over by the new display and the observer is already set.