| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index b3e2b8d8ff657782c9311b1e9a48cd4bdbd2d57e..b96c201cf62b92d68d3105f0f5a93ca84cb4fdde 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -39,7 +39,7 @@
|
| #include "ash/system/tray/system_tray_delegate.h"
|
| #include "ash/system/tray/system_tray_notifier.h"
|
| #include "ash/system/web_notification/web_notification_tray.h"
|
| -#include "ash/touch/touch_observer_hud.h"
|
| +#include "ash/touch/touch_hud_debug.h"
|
| #include "ash/volume_control_delegate.h"
|
| #include "ash/wm/partial_screenshot_view.h"
|
| #include "ash/wm/power_button_controller.h"
|
| @@ -561,8 +561,8 @@ bool AcceleratorController::PerformAction(int action,
|
| case TOUCH_HUD_CLEAR: {
|
| internal::RootWindowController* controller =
|
| internal::RootWindowController::ForActiveRootWindow();
|
| - if (controller->touch_observer_hud()) {
|
| - controller->touch_observer_hud()->Clear();
|
| + if (controller->touch_hud_debug()) {
|
| + controller->touch_hud_debug()->Clear();
|
| return true;
|
| }
|
| return false;
|
| @@ -570,12 +570,17 @@ bool AcceleratorController::PerformAction(int action,
|
| case TOUCH_HUD_MODE_CHANGE: {
|
| internal::RootWindowController* controller =
|
| internal::RootWindowController::ForActiveRootWindow();
|
| - if (controller->touch_observer_hud()) {
|
| - controller->touch_observer_hud()->ChangeToNextMode();
|
| + if (controller->touch_hud_debug()) {
|
| + controller->touch_hud_debug()->ChangeToNextMode();
|
| return true;
|
| }
|
| return false;
|
| }
|
| + case TOUCH_HUD_PROJECTION_TOGGLE: {
|
| + bool enabled = Shell::GetInstance()->is_touch_hud_projection_enabled();
|
| + Shell::GetInstance()->SetTouchHudProjectionEnabled(!enabled);
|
| + return true;
|
| + }
|
| case DISABLE_GPU_WATCHDOG:
|
| content::GpuDataManager::GetInstance()->DisableGpuWatchdog();
|
| return true;
|
|
|