| 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;
|
| }
|
|
|
|
|