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

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

Issue 17515005: Do not put v1 app windows or popup windows into immersive fullscreen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 ROTATE_WINDOW }, 102 ROTATE_WINDOW },
103 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN, 103 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN,
104 CYCLE_BACKWARD_LINEAR }, 104 CYCLE_BACKWARD_LINEAR },
105 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, 105 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB },
106 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, 106 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT },
107 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should 107 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should
108 // act on release instead of press when using Search as a modifier key for 108 // act on release instead of press when using Search as a modifier key for
109 // extended keyboard shortcuts. 109 // extended keyboard shortcuts.
110 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, 110 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
111 { false, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK }, 111 { false, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK },
112 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_MAXIMIZED }, 112 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN },
113 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN }, 113 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN },
114 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, 114 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
115 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, 115 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
116 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, 116 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
117 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, 117 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER },
118 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, 118 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
119 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 119 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
120 SHOW_KEYBOARD_OVERLAY }, 120 SHOW_KEYBOARD_OVERLAY },
121 { true, ui::VKEY_OEM_2, 121 { true, ui::VKEY_OEM_2,
122 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 122 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 ADD_REMOVE_DISPLAY, 401 ADD_REMOVE_DISPLAY,
402 DISABLE_GPU_WATCHDOG, 402 DISABLE_GPU_WATCHDOG,
403 TOGGLE_MIRROR_MODE, 403 TOGGLE_MIRROR_MODE,
404 #endif // defined(OS_CHROMEOS) 404 #endif // defined(OS_CHROMEOS)
405 }; 405 };
406 406
407 const size_t kActionsAllowedInAppModeLength = 407 const size_t kActionsAllowedInAppModeLength =
408 arraysize(kActionsAllowedInAppMode); 408 arraysize(kActionsAllowedInAppMode);
409 409
410 } // namespace ash 410 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698