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

Unified Diff: ash/shell/window_watcher.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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
Index: ash/shell/window_watcher.cc
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index 9a0d4222a91a166707bb5aec8d6d858f04fecb50..eb7b888b2d0857ccd492e982793bde0a6c84f5b7 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -12,9 +12,9 @@
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/shell/window_watcher_shelf_item_delegate.h"
+#include "ash/shell_port.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
@@ -134,7 +134,8 @@ void WindowWatcher::OnWillRemoveWindow(aura::Window* window) {
}
void WindowWatcher::OnDisplayAdded(const display::Display& new_display) {
- WmWindow* root = WmShell::Get()->GetRootWindowForDisplayId(new_display.id());
+ WmWindow* root =
+ ShellPort::Get()->GetRootWindowForDisplayId(new_display.id());
workspace_window_watcher_->RootWindowAdded(root->aura_window());
}

Powered by Google App Engine
This is Rietveld 408576698