| Index: ash/common/system/date/date_default_view.cc
|
| diff --git a/ash/common/system/date/date_default_view.cc b/ash/common/system/date/date_default_view.cc
|
| index fda2467352be4686bc812b573dea79d662fd0ab2..a0b92e84cd1f7efe8ae6eadc72c709715b72c3c7 100644
|
| --- a/ash/common/system/date/date_default_view.cc
|
| +++ b/ash/common/system/date/date_default_view.cc
|
| @@ -14,6 +14,8 @@
|
| #include "ash/common/system/tray/tray_constants.h"
|
| #include "ash/common/system/tray/tray_popup_header_button.h"
|
| #include "ash/common/wm_shell.h"
|
| +#include "ash/shell.h"
|
| +#include "ash/wm/lock_state_controller.h"
|
| #include "base/i18n/rtl.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "chromeos/dbus/session_manager_client.h"
|
| @@ -129,7 +131,7 @@ void DateDefaultView::ButtonPressed(views::Button* sender,
|
| shell->system_tray_controller()->ShowHelp();
|
| } else if (sender == shutdown_button_) {
|
| shell->RecordUserMetricsAction(UMA_TRAY_SHUT_DOWN);
|
| - shell->RequestShutdown();
|
| + Shell::GetInstance()->lock_state_controller()->RequestShutdown();
|
| } else if (sender == lock_button_) {
|
| shell->RecordUserMetricsAction(UMA_TRAY_LOCK_SCREEN);
|
| chromeos::DBusThreadManager::Get()
|
|
|