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

Side by Side Diff: ash/accelerators/accelerator_table.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 | « ash/accelerators/accelerator_table.h ('k') | ash/new_window_delegate.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_table.h" 5 #include "ash/accelerators/accelerator_table.h"
6 6
7 #include "ash/strings/grit/ash_strings.h" 7 #include "ash/strings/grit/ash_strings.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 // key. 58 // key.
59 {true, ui::VKEY_SLEEP, ui::EF_NONE, LOCK_PRESSED}, 59 {true, ui::VKEY_SLEEP, ui::EF_NONE, LOCK_PRESSED},
60 {false, ui::VKEY_SLEEP, ui::EF_NONE, LOCK_RELEASED}, 60 {false, ui::VKEY_SLEEP, ui::EF_NONE, LOCK_RELEASED},
61 {true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED}, 61 {true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED},
62 {false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED}, 62 {false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED},
63 {true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FILE_MANAGER}, 63 {true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FILE_MANAGER},
64 {true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, OPEN_GET_HELP}, 64 {true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, OPEN_GET_HELP},
65 {true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 65 {true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
66 OPEN_GET_HELP}, 66 OPEN_GET_HELP},
67 {true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH}, 67 {true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH},
68 {true, ui::VKEY_N, ui::VKEY_BROWSER_SEARCH | ui::EF_SHIFT_DOWN,
69 OPEN_NETWORK_DIAG},
68 {true, ui::VKEY_G, 70 {true, ui::VKEY_G,
69 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 71 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
70 DISABLE_GPU_WATCHDOG}, 72 DISABLE_GPU_WATCHDOG},
71 {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 73 {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
72 TOUCH_HUD_MODE_CHANGE}, 74 TOUCH_HUD_MODE_CHANGE},
73 {true, ui::VKEY_I, 75 {true, ui::VKEY_I,
74 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, 76 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
75 TOUCH_HUD_CLEAR}, 77 TOUCH_HUD_CLEAR},
76 {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 78 {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
77 TOUCH_HUD_PROJECTION_TOGGLE}, 79 TOUCH_HUD_PROJECTION_TOGGLE},
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 TOGGLE_WIFI, 522 TOGGLE_WIFI,
521 VOLUME_DOWN, 523 VOLUME_DOWN,
522 VOLUME_MUTE, 524 VOLUME_MUTE,
523 VOLUME_UP, 525 VOLUME_UP,
524 #endif // defined(OS_CHROMEOS) 526 #endif // defined(OS_CHROMEOS)
525 }; 527 };
526 528
527 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 529 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
528 530
529 } // namespace ash 531 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/new_window_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698