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

Side by Side Diff: ash/accelerators/accelerator_controller.cc

Issue 2168143002: Adding keyboard shortcut BROWSE+SHIFT+N to launch 'Connectivity diag.' extension. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed key combo to browse shift N to avoid accidents. Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/accelerators/accelerator_controller.h" 5 #include "ash/accelerators/accelerator_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 void HandleFileManager() { 600 void HandleFileManager() {
601 base::RecordAction(UserMetricsAction("Accel_Open_File_Manager")); 601 base::RecordAction(UserMetricsAction("Accel_Open_File_Manager"));
602 602
603 Shell::GetInstance()->new_window_delegate()->OpenFileManager(); 603 Shell::GetInstance()->new_window_delegate()->OpenFileManager();
604 } 604 }
605 605
606 void HandleGetHelp() { 606 void HandleGetHelp() {
607 Shell::GetInstance()->new_window_delegate()->OpenGetHelp(); 607 Shell::GetInstance()->new_window_delegate()->OpenGetHelp();
608 } 608 }
609 609
610 void HandleNetworkDiag() {
611 base::RecordAction(UserMetricsAction("Accel_Network_Diag"));
612 Shell::GetInstance()->new_window_delegate()->OpenNetworkDiag();
613 }
614
610 void HandleSwapPrimaryDisplay() { 615 void HandleSwapPrimaryDisplay() {
611 base::RecordAction(UserMetricsAction("Accel_Swap_Primary_Display")); 616 base::RecordAction(UserMetricsAction("Accel_Swap_Primary_Display"));
612 Shell::GetInstance()->display_configuration_controller()->SetPrimaryDisplayId( 617 Shell::GetInstance()->display_configuration_controller()->SetPrimaryDisplayId(
613 ScreenUtil::GetSecondaryDisplay().id(), true /* user_action */); 618 ScreenUtil::GetSecondaryDisplay().id(), true /* user_action */);
614 } 619 }
615 620
616 bool CanHandleCycleUser() { 621 bool CanHandleCycleUser() {
617 return WmShell::Get()->delegate()->IsMultiProfilesEnabled() && 622 return WmShell::Get()->delegate()->IsMultiProfilesEnabled() &&
618 WmShell::Get()->GetSessionStateDelegate()->NumberOfLoggedInUsers() > 1; 623 WmShell::Get()->GetSessionStateDelegate()->NumberOfLoggedInUsers() > 1;
619 } 624 }
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 #if defined(OS_CHROMEOS) 1052 #if defined(OS_CHROMEOS)
1048 case BRIGHTNESS_DOWN: 1053 case BRIGHTNESS_DOWN:
1049 case BRIGHTNESS_UP: 1054 case BRIGHTNESS_UP:
1050 case DISABLE_GPU_WATCHDOG: 1055 case DISABLE_GPU_WATCHDOG:
1051 case KEYBOARD_BRIGHTNESS_DOWN: 1056 case KEYBOARD_BRIGHTNESS_DOWN:
1052 case KEYBOARD_BRIGHTNESS_UP: 1057 case KEYBOARD_BRIGHTNESS_UP:
1053 case LOCK_PRESSED: 1058 case LOCK_PRESSED:
1054 case LOCK_RELEASED: 1059 case LOCK_RELEASED:
1055 case OPEN_CROSH: 1060 case OPEN_CROSH:
1056 case OPEN_FILE_MANAGER: 1061 case OPEN_FILE_MANAGER:
1062 case OPEN_NETWORK_DIAG:
1057 case OPEN_GET_HELP: 1063 case OPEN_GET_HELP:
1058 case POWER_PRESSED: 1064 case POWER_PRESSED:
1059 case POWER_RELEASED: 1065 case POWER_RELEASED:
1060 case SUSPEND: 1066 case SUSPEND:
1061 case TOGGLE_MIRROR_MODE: 1067 case TOGGLE_MIRROR_MODE:
1062 case TOGGLE_SPOKEN_FEEDBACK: 1068 case TOGGLE_SPOKEN_FEEDBACK:
1063 case TOGGLE_WIFI: 1069 case TOGGLE_WIFI:
1064 case TOUCH_HUD_PROJECTION_TOGGLE: 1070 case TOUCH_HUD_PROJECTION_TOGGLE:
1065 case VOLUME_DOWN: 1071 case VOLUME_DOWN:
1066 case VOLUME_MUTE: 1072 case VOLUME_MUTE:
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 break; 1300 break;
1295 case LOCK_SCREEN: 1301 case LOCK_SCREEN:
1296 HandleLock(); 1302 HandleLock();
1297 break; 1303 break;
1298 case OPEN_CROSH: 1304 case OPEN_CROSH:
1299 HandleCrosh(); 1305 HandleCrosh();
1300 break; 1306 break;
1301 case OPEN_FILE_MANAGER: 1307 case OPEN_FILE_MANAGER:
1302 HandleFileManager(); 1308 HandleFileManager();
1303 break; 1309 break;
1310 case OPEN_NETWORK_DIAG:
1311 HandleNetworkDiag();
1312 break;
1304 case OPEN_GET_HELP: 1313 case OPEN_GET_HELP:
1305 HandleGetHelp(); 1314 HandleGetHelp();
1306 break; 1315 break;
1307 case POWER_PRESSED: // fallthrough 1316 case POWER_PRESSED: // fallthrough
1308 case POWER_RELEASED: 1317 case POWER_RELEASED:
1309 if (!base::SysInfo::IsRunningOnChromeOS()) { 1318 if (!base::SysInfo::IsRunningOnChromeOS()) {
1310 // There is no powerd, the Chrome OS power manager, in linux desktop, 1319 // There is no powerd, the Chrome OS power manager, in linux desktop,
1311 // so call the PowerButtonController here. 1320 // so call the PowerButtonController here.
1312 Shell::GetInstance()->power_button_controller()->OnPowerButtonEvent( 1321 Shell::GetInstance()->power_button_controller()->OnPowerButtonEvent(
1313 action == POWER_PRESSED, base::TimeTicks()); 1322 action == POWER_PRESSED, base::TimeTicks());
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 if (wm_shell->mru_window_tracker()->BuildMruWindowList().empty() && 1417 if (wm_shell->mru_window_tracker()->BuildMruWindowList().empty() &&
1409 actions_needing_window_.find(action) != actions_needing_window_.end()) { 1418 actions_needing_window_.find(action) != actions_needing_window_.end()) {
1410 wm_shell->accessibility_delegate()->TriggerAccessibilityAlert( 1419 wm_shell->accessibility_delegate()->TriggerAccessibilityAlert(
1411 A11Y_ALERT_WINDOW_NEEDED); 1420 A11Y_ALERT_WINDOW_NEEDED);
1412 return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION; 1421 return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION;
1413 } 1422 }
1414 return RESTRICTION_NONE; 1423 return RESTRICTION_NONE;
1415 } 1424 }
1416 1425
1417 } // namespace ash 1426 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698