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

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

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 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
« no previous file with comments | « chrome/test/base/menu_model_test.h ('k') | ui/aura_shell/shell_accelerator_controller.cc » ('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) 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 #ifndef UI_AURA_SHELL_SHELL_ACCELERATOR_CONTROLLER_H_ 5 #ifndef UI_AURA_SHELL_SHELL_ACCELERATOR_CONTROLLER_H_
6 #define UI_AURA_SHELL_SHELL_ACCELERATOR_CONTROLLER_H_ 6 #define UI_AURA_SHELL_SHELL_ACCELERATOR_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "ui/aura_shell/aura_shell_export.h" 12 #include "ui/aura_shell/aura_shell_export.h"
13 #include "ui/base/models/accelerator.h" 13 #include "ui/base/accelerators/accelerator.h"
14 14
15 namespace ui { 15 namespace ui {
16 class AcceleratorManager; 16 class AcceleratorManager;
17 } // namespace ui 17 }
18 18
19 namespace aura_shell { 19 namespace aura_shell {
20 20
21 // ShellAcceleratorController provides functions for registering or 21 // ShellAcceleratorController provides functions for registering or
22 // unregistering global keyboard accelerators, which are handled earlier than 22 // unregistering global keyboard accelerators, which are handled earlier than
23 // any windows. It also implements several handlers as an accelerator target. 23 // any windows. It also implements several handlers as an accelerator target.
24 class AURA_SHELL_EXPORT ShellAcceleratorController 24 class AURA_SHELL_EXPORT ShellAcceleratorController
25 : public ui::AcceleratorTarget { 25 : public ui::AcceleratorTarget {
26 public: 26 public:
27 ShellAcceleratorController(); 27 ShellAcceleratorController();
(...skipping 25 matching lines...) Expand all
53 53
54 private: 54 private:
55 scoped_ptr<ui::AcceleratorManager> accelerator_manager_; 55 scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(ShellAcceleratorController); 57 DISALLOW_COPY_AND_ASSIGN(ShellAcceleratorController);
58 }; 58 };
59 59
60 } // namespace aura_shell 60 } // namespace aura_shell
61 61
62 #endif // UI_AURA_SHELL_SHELL_ACCELERATOR_CONTROLLER_H_ 62 #endif // UI_AURA_SHELL_SHELL_ACCELERATOR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/test/base/menu_model_test.h ('k') | ui/aura_shell/shell_accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698