ui/aura_shell/shell_accelerator_controller.cc - Issue 8695005: Move accelerator related files to ui/base/accelerators

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/aura_shell/shell_accelerator_controller.cc

Issue 8695005: Move accelerator related files to ui/base/accelerators (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 1 month 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

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "ui/aura_shell/shell_accelerator_controller.h"	5 #include "ui/aura_shell/shell_accelerator_controller.h"

6	6

7 #include "ui/aura/desktop.h"	7 #include "ui/aura/desktop.h"

8 #include "ui/aura/event.h"	8 #include "ui/aura/event.h"

9 #include "ui/aura_shell/shell.h"	9 #include "ui/aura_shell/shell.h"

10 #include "ui/base/accelerator_manager.h"	10 #include "ui/base/accelerators/accelerator.h"

11 #include "ui/base/models/accelerator.h"	11 #include "ui/base/accelerators/accelerator_manager.h"

12 #include "ui/gfx/compositor/layer_animation_sequence.h"	12 #include "ui/gfx/compositor/layer_animation_sequence.h"

13 #include "ui/gfx/compositor/layer_animator.h"	13 #include "ui/gfx/compositor/layer_animator.h"

14 #include "ui/gfx/compositor/screen_rotation.h"	14 #include "ui/gfx/compositor/screen_rotation.h"

15	15

16 namespace {	16 namespace {

17	17

18 // Acceleraters handled by ShellAcceleratorController.	18 // Acceleraters handled by ShellAcceleratorController.

19 struct AcceleratorData {	19 struct AcceleratorData {

20 ui::KeyboardCode keycode;	20 ui::KeyboardCode keycode;

21 bool shift;	21 bool shift;

(...skipping 95 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
117 } else if (accelerator.key_code() == ui::VKEY_HOME &&	117 } else if (accelerator.key_code() == ui::VKEY_HOME &&

118 accelerator.IsCtrlDown()) {	118 accelerator.IsCtrlDown()) {

119 RotateScreen();	119 RotateScreen();

120 return true;	120 return true;

121 }	121 }

122 #endif	122 #endif

123 return false;	123 return false;

124 }	124 }

125	125

126 } // namespace aura_shell	126 } // namespace aura_shell

OLD	NEW

« no previous file with comments | « ui/aura_shell/shell_accelerator_controller.h ('k') | ui/aura_shell/shell_accelerator_filter.cc » ('j') | no next file with comments »