Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1864)

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 17063013: Separate projection mode from rest of touch HUD (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed TouchHudDebug and applied some more reviews Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.h » ('j') | ash/root_window_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index f30ce5dde2e09a4df5132d11e6acc9568228f2e9..3f4a829286f32a7b87662846be9d1b5682aae906 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,15 @@ 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:
+ Shell::GetInstance()->ToggleTouchHudProjection();
+ return true;
case DISABLE_GPU_WATCHDOG:
content::GpuDataManager::GetInstance()->DisableGpuWatchdog();
return true;
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.h » ('j') | ash/root_window_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698