ash/shell/window_watcher.cc - Issue 2886253002: mash: remove more shell/shelf WmWindow usage.

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/shell/window_watcher.cc

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)

Patch Set: Fix WmShelf::ForWindow. Created 3 years, 7 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/shell/window_watcher.cc

diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc

index cc991ac415ab96f52fc63c4347ad1f14f2965996..dd746999c53e11e60a1aaf8f4443b0c2029a4bbe 100644

--- a/ash/shell/window_watcher.cc

+++ b/ash/shell/window_watcher.cc

@@ -135,9 +135,9 @@ void WindowWatcher::OnWillRemoveWindow(aura::Window* window) {

}

void WindowWatcher::OnDisplayAdded(const display::Display& new_display) {

- WmWindow* root =

+ aura::Window* root =

ShellPort::Get()->GetRootWindowForDisplayId(new_display.id());

- workspace_window_watcher_->RootWindowAdded(root->aura_window());

+ workspace_window_watcher_->RootWindowAdded(root);

}

void WindowWatcher::OnDisplayRemoved(const display::Display& old_display) {

« no previous file with comments | « ash/shell.cc ('k') | ash/shell_port.h » ('j') | no next file with comments »