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

Unified Diff: ash/wm/screen_pinning_controller.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/wm/screen_pinning_controller.cc
diff --git a/ash/wm/screen_pinning_controller.cc b/ash/wm/screen_pinning_controller.cc
index a5187212eb96422f8fbe52f038b1a04abb8be245..a4658d88f61b44360d5b9da3dbf8023d8d7c0800 100644
--- a/ash/wm/screen_pinning_controller.cc
+++ b/ash/wm/screen_pinning_controller.cc
@@ -9,11 +9,11 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/window_user_data.h"
#include "ash/wm/container_finder.h"
#include "ash/wm/window_dimmer.h"
#include "ash/wm/window_state.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "base/auto_reset.h"
#include "base/logging.h"
@@ -157,11 +157,11 @@ ScreenPinningController::ScreenPinningController()
base::MakeUnique<SystemModalContainerWindowObserver>(this)),
system_modal_container_child_window_observer_(
base::MakeUnique<SystemModalContainerChildWindowObserver>(this)) {
- WmShell::Get()->AddDisplayObserver(this);
+ ShellPort::Get()->AddDisplayObserver(this);
}
ScreenPinningController::~ScreenPinningController() {
- WmShell::Get()->RemoveDisplayObserver(this);
+ ShellPort::Get()->RemoveDisplayObserver(this);
}
bool ScreenPinningController::IsPinned() const {

Powered by Google App Engine
This is Rietveld 408576698