Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(448)

Unified Diff: ash/shelf/shelf_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/shelf/shelf_window_watcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_window_watcher.cc
diff --git a/ash/shelf/shelf_window_watcher.cc b/ash/shelf/shelf_window_watcher.cc
index b48437a98cb75132bfc3f6737a39578a85712771..cc3555323491bf88e44d134117ee5ca47f400b9f 100644
--- a/ash/shelf/shelf_window_watcher.cc
+++ b/ash/shelf/shelf_window_watcher.cc
@@ -275,21 +275,20 @@ void ShelfWindowWatcher::OnWindowActivated(ActivationReason reason,
}
void ShelfWindowWatcher::OnDisplayAdded(const display::Display& new_display) {
- WmWindow* root =
+ aura::Window* root =
ShellPort::Get()->GetRootWindowForDisplayId(new_display.id());
- aura::Window* aura_root = WmWindow::GetAuraWindow(root);
// When the primary root window's display is removed, the existing root window
// is taken over by the new display, and the observer is already set.
aura::Window* default_container =
- aura_root->GetChildById(kShellWindowId_DefaultContainer);
+ root->GetChildById(kShellWindowId_DefaultContainer);
if (!observed_container_windows_.IsObserving(default_container)) {
for (aura::Window* window : default_container->children())
OnUserWindowAdded(window);
observed_container_windows_.Add(default_container);
}
aura::Window* panel_container =
- aura_root->GetChildById(kShellWindowId_PanelContainer);
+ root->GetChildById(kShellWindowId_PanelContainer);
if (!observed_container_windows_.IsObserving(panel_container)) {
for (aura::Window* window : panel_container->children())
OnUserWindowAdded(window);
« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/shelf/shelf_window_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698