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

Unified Diff: chrome/browser/chromeos/login/lock/webui_screen_locker.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: chrome/browser/chromeos/login/lock/webui_screen_locker.cc
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
index 7d4bc3a3cc95e2b0e8ef1c503d0aa34e5c3b02a3..8eb0e41b6aa99705a1aaaa55d59ff63db1309f15 100644
--- a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
+++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/system/power/power_event_observer.h"
-#include "ash/wm_shell.h"
#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/metrics/histogram_macros.h"
@@ -125,7 +125,7 @@ WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker)
network_state_helper_(new login::NetworkStateHelper),
weak_factory_(this) {
set_should_emit_login_prompt_visible(false);
- ash::WmShell::Get()->AddLockStateObserver(this);
+ ash::ShellPort::Get()->AddLockStateObserver(this);
ash::Shell::Get()->AddShellObserver(this);
display::Screen::GetScreen()->AddObserver(this);
DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
@@ -139,7 +139,7 @@ WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker)
WebUIScreenLocker::~WebUIScreenLocker() {
DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
display::Screen::GetScreen()->RemoveObserver(this);
- ash::WmShell::Get()->RemoveLockStateObserver(this);
+ ash::ShellPort::Get()->RemoveLockStateObserver(this);
ash::Shell::Get()->RemoveShellObserver(this);
// In case of shutdown, lock_window_ may be deleted before WebUIScreenLocker.
if (lock_window_) {

Powered by Google App Engine
This is Rietveld 408576698