| 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 7f66235cfc8801c8bea789b9af2270ebd4228c06..7da7fcdc6672e0d9800e3d55d11724e9adc8ab93 100644
|
| --- a/ash/common/system/chromeos/palette/palette_tray.cc
|
| +++ b/ash/common/system/chromeos/palette/palette_tray.cc
|
| @@ -67,7 +67,7 @@ bool IsInUserSession() {
|
| return !session_controller->IsUserSessionBlocked() &&
|
| session_controller->GetSessionState() ==
|
| session_manager::SessionState::ACTIVE &&
|
| - WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
|
| + Shell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
|
| LoginStatus::KIOSK_APP;
|
| }
|
|
|
| @@ -125,12 +125,12 @@ class TitleView : public views::View, public views::ButtonListener {
|
| if (sender == settings_button_) {
|
| palette_tray_->RecordPaletteOptionsUsage(
|
| PaletteTrayOptions::PALETTE_SETTINGS_BUTTON);
|
| - WmShell::Get()->system_tray_controller()->ShowPaletteSettings();
|
| + Shell::Get()->system_tray_controller()->ShowPaletteSettings();
|
| palette_tray_->HidePalette();
|
| } else if (sender == help_button_) {
|
| palette_tray_->RecordPaletteOptionsUsage(
|
| PaletteTrayOptions::PALETTE_HELP_BUTTON);
|
| - WmShell::Get()->system_tray_controller()->ShowPaletteHelp();
|
| + Shell::Get()->system_tray_controller()->ShowPaletteHelp();
|
| palette_tray_->HidePalette();
|
| } else {
|
| NOTREACHED();
|
|
|