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

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 1394573003: chromeos: Add SurfaceServiceProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 77c3ed2a560cf0d7f53f13162c93b1a60ab9e857..c54a0023bb162f5dd992601a0ef37773861579fd 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -33,6 +33,7 @@
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/shell_window_ids.h"
+#include "ash/surfaces/test_shell_surface_overlay_view.h"
#include "ash/system/brightness_control_delegate.h"
#include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"
#include "ash/system/status_area_widget.h"
@@ -349,6 +350,18 @@ void HandleRotateActiveWindow() {
}
}
+void HandleShowTestShellSurfaceOverlay() {
+ base::RecordAction(
+ UserMetricsAction("Accel_Show_Test_Shell_Surface_Overlay"));
+ TestShellSurfaceOverlayView::Show();
+}
+
+void HandleShowFullscreenTestShellSurfaceOverlay() {
+ base::RecordAction(
+ UserMetricsAction("Accel_Show_Fullscreen_Test_Shell_Surface_Overlay"));
+ TestShellSurfaceOverlayView::ShowFullscreen();
+}
+
void HandleShowKeyboardOverlay() {
base::RecordAction(UserMetricsAction("Accel_Show_Keyboard_Overlay"));
ash::Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay();
@@ -1024,6 +1037,8 @@ bool AcceleratorController::CanPerformAction(
case RESTORE_TAB:
case ROTATE_SCREEN:
case ROTATE_WINDOW:
+ case SHOW_TEST_SHELL_SURFACE_OVERLAY:
+ case SHOW_FULLSCREEN_TEST_SHELL_SURFACE_OVERLAY:
case SHOW_KEYBOARD_OVERLAY:
case SHOW_SYSTEM_TRAY_BUBBLE:
case SHOW_TASK_MANAGER:
@@ -1184,6 +1199,12 @@ void AcceleratorController::PerformAction(AcceleratorAction action,
case SCALE_UI_UP:
accelerators::ZoomInternalDisplay(true /* up */);
break;
+ case SHOW_TEST_SHELL_SURFACE_OVERLAY:
+ HandleShowTestShellSurfaceOverlay();
+ break;
+ case SHOW_FULLSCREEN_TEST_SHELL_SURFACE_OVERLAY:
+ HandleShowFullscreenTestShellSurfaceOverlay();
+ break;
case SHOW_KEYBOARD_OVERLAY:
HandleShowKeyboardOverlay();
break;
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.h » ('j') | chromeos/dbus/services/surface_service_provider.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698