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: ash/common/system/chromeos/palette/palette_tray.cc

Issue 2761373002: Move yet more from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 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/common/system/chromeos/palette/palette_tray.cc
diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc
index f2d8ca400b936e29e204a0ea5ed7af1baaef7f3b..197e75ab03fb3bc549944d06143bef0be4e62b7a 100644
--- a/ash/common/system/chromeos/palette/palette_tray.cc
+++ b/ash/common/system/chromeos/palette/palette_tray.cc
@@ -63,7 +63,7 @@ const SkColor kPaletteSeparatorColor = SkColorSetARGB(0x1E, 0x00, 0x00, 0x00);
// Returns true if we are in a user session that can show the stylus tools.
bool IsInUserSession() {
- SessionController* session_controller = WmShell::Get()->session_controller();
+ SessionController* session_controller = Shell::Get()->session_controller();
return !session_controller->IsUserSessionBlocked() &&
session_controller->GetSessionState() ==
session_manager::SessionState::ACTIVE &&
@@ -165,7 +165,7 @@ PaletteTray::PaletteTray(WmShelf* wm_shelf)
tray_container()->AddChildView(icon_);
Shell::GetInstance()->AddShellObserver(this);
- WmShell::Get()->session_controller()->AddSessionStateObserver(this);
+ Shell::Get()->session_controller()->AddSessionStateObserver(this);
ui::InputDeviceManager::GetInstance()->AddObserver(this);
}
@@ -175,7 +175,7 @@ PaletteTray::~PaletteTray() {
ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
Shell::GetInstance()->RemoveShellObserver(this);
- WmShell::Get()->session_controller()->RemoveSessionStateObserver(this);
+ Shell::Get()->session_controller()->RemoveSessionStateObserver(this);
}
bool PaletteTray::PerformAction(const ui::Event& event) {
« no previous file with comments | « ash/common/system/chromeos/network/tray_vpn.cc ('k') | ash/common/system/chromeos/settings/tray_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698