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

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

Issue 550373002: chromeos: Shorten some strings in the keyboard overlay. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update metrics owners Created 6 years, 3 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
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 "base/basictypes.h" 7 #include "base/basictypes.h"
8 8
9 namespace ash { 9 namespace ash {
10 10
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, 113 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT },
114 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should 114 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should
115 // act on release instead of press when using Search as a modifier key for 115 // act on release instead of press when using Search as a modifier key for
116 // extended keyboard shortcuts. 116 // extended keyboard shortcuts.
117 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, 117 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
118 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN }, 118 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN },
119 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN }, 119 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN },
120 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, 120 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
121 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, 121 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
122 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, 122 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
123 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, 123 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF },
124 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, 124 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
125 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 125 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
126 SHOW_KEYBOARD_OVERLAY }, 126 SHOW_KEYBOARD_OVERLAY },
127 { true, ui::VKEY_OEM_2, 127 { true, ui::VKEY_OEM_2,
128 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 128 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
129 SHOW_KEYBOARD_OVERLAY }, 129 SHOW_KEYBOARD_OVERLAY },
130 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, 130 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
131 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 131 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
132 SHOW_MESSAGE_CENTER_BUBBLE }, 132 SHOW_MESSAGE_CENTER_BUBBLE },
133 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 133 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 WINDOW_MINIMIZE, 421 WINDOW_MINIMIZE,
422 TOGGLE_FULLSCREEN, 422 TOGGLE_FULLSCREEN,
423 TOGGLE_MAXIMIZED, 423 TOGGLE_MAXIMIZED,
424 WINDOW_POSITION_CENTER, 424 WINDOW_POSITION_CENTER,
425 ROTATE_WINDOW, 425 ROTATE_WINDOW,
426 }; 426 };
427 427
428 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow); 428 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow);
429 429
430 } // namespace ash 430 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698