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

Unified Diff: ash/common/system/chromeos/settings/tray_settings.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
« no previous file with comments | « ash/common/system/chromeos/palette/palette_tray.cc ('k') | ash/common/system/date/date_default_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/settings/tray_settings.cc
diff --git a/ash/common/system/chromeos/settings/tray_settings.cc b/ash/common/system/chromeos/settings/tray_settings.cc
index 0d8a0aaef2c372693aff0ad534644becbf09b71e..9c10928fd3e7e81b68fabf7c180eb6f9db666ab6 100644
--- a/ash/common/system/chromeos/settings/tray_settings.cc
+++ b/ash/common/system/chromeos/settings/tray_settings.cc
@@ -50,7 +50,7 @@ class SettingsDefaultView : public ActionableView,
bool power_view_right_align = false;
if (login_status_ != LoginStatus::NOT_LOGGED_IN &&
login_status_ != LoginStatus::LOCKED &&
- !WmShell::Get()->session_controller()->IsInSecondaryLoginScreen()) {
+ !Shell::Get()->session_controller()->IsInSecondaryLoginScreen()) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
views::ImageView* icon = TrayPopupUtils::CreateMainImageView();
@@ -84,7 +84,7 @@ class SettingsDefaultView : public ActionableView,
bool PerformAction(const ui::Event& event) override {
if (login_status_ == LoginStatus::NOT_LOGGED_IN ||
login_status_ == LoginStatus::LOCKED ||
- WmShell::Get()->session_controller()->IsInSecondaryLoginScreen()) {
+ Shell::Get()->session_controller()->IsInSecondaryLoginScreen()) {
return false;
}
« no previous file with comments | « ash/common/system/chromeos/palette/palette_tray.cc ('k') | ash/common/system/date/date_default_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698