From 5e01dfa96782c9d75ea35ad31f24909759ce1455 Mon Sep 17 00:00:00 2001 From: oshima Date: Thu, 3 Mar 2016 12:51:37 -0800 Subject: Enable swap primary accelerator only when possible BUG=591241 TEST=manual Review URL: https://codereview.chromium.org/1759213002 Cr-Commit-Position: refs/heads/master@{#379082} --- ash/accelerators/accelerator_controller.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ash') diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 955ba8e..2ed2a55 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -1050,8 +1050,9 @@ bool AcceleratorController::CanPerformAction( case TOUCH_HUD_CLEAR: case TOUCH_HUD_MODE_CHANGE: return CanHandleTouchHud(); + case SWAP_PRIMARY_DISPLAY: + return gfx::Screen::GetScreen()->GetNumDisplays() > 1; #endif - case CYCLE_BACKWARD_MRU: case CYCLE_FORWARD_MRU: case EXIT: @@ -1099,7 +1100,6 @@ bool AcceleratorController::CanPerformAction( case OPEN_GET_HELP: case POWER_PRESSED: case POWER_RELEASED: - case SWAP_PRIMARY_DISPLAY: case TOGGLE_MIRROR_MODE: case TOGGLE_SPOKEN_FEEDBACK: case TOGGLE_WIFI: -- cgit v1.1