| Index: ash/common/accelerators/accelerator_controller.cc
|
| diff --git a/ash/common/accelerators/accelerator_controller.cc b/ash/common/accelerators/accelerator_controller.cc
|
| index c7c4e6e2fa99a199b51877aafa73a41dd9e4c092..2baa67b5038041484d071ce643d3a42a1fc4dde7 100644
|
| --- a/ash/common/accelerators/accelerator_controller.cc
|
| +++ b/ash/common/accelerators/accelerator_controller.cc
|
| @@ -41,6 +41,7 @@
|
| #include "ui/keyboard/keyboard_controller.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| +#include "ash/common/dbus_thread_manager_ash.h"
|
| #include "ash/common/palette_delegate.h"
|
| #include "ash/common/shelf/wm_shelf.h"
|
| #include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h"
|
| @@ -49,7 +50,7 @@
|
| #include "ash/common/system/status_area_widget.h"
|
| #include "ash/common/wm_root_window_controller.h"
|
| #include "ash/common/wm_window.h"
|
| -#include "chromeos/dbus/dbus_thread_manager.h"
|
| +// #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "chromeos/dbus/power_manager_client.h"
|
| #include "ui/base/ime/chromeos/ime_keyboard.h"
|
| #include "ui/base/ime/chromeos/input_method_manager.h"
|
| @@ -420,7 +421,7 @@ bool CanHandleShowStylusTools() {
|
|
|
| void HandleSuspend() {
|
| base::RecordAction(UserMetricsAction("Accel_Suspend"));
|
| - chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestSuspend();
|
| + DBusThreadManagerAsh::Get()->GetPowerManagerClient()->RequestSuspend();
|
| }
|
|
|
| bool CanHandleCycleUser() {
|
|
|