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

Side by Side Diff: ash/accelerators/accelerator_controller.h

Issue 9033007: Rename the aura_shell namespace to ash (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 | « no previous file | ash/accelerators/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 ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ 5 #ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
6 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ 6 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "ash/ash_export.h" 14 #include "ash/ash_export.h"
tfarina 2011/12/24 00:48:55 nit: sort, we could pass tool/sort_headers.py in t
15 #include "ui/base/accelerators/accelerator.h" 15 #include "ui/base/accelerators/accelerator.h"
16 16
17 namespace ui { 17 namespace ui {
18 class AcceleratorManager; 18 class AcceleratorManager;
19 } 19 }
20 20
21 namespace aura_shell { 21 namespace ash {
22 22
23 class ScreenshotDelegate; 23 class ScreenshotDelegate;
24 24
25 // AcceleratorController provides functions for registering or unregistering 25 // AcceleratorController provides functions for registering or unregistering
26 // global keyboard accelerators, which are handled earlier than any windows. It 26 // global keyboard accelerators, which are handled earlier than any windows. It
27 // also implements several handlers as an accelerator target. 27 // also implements several handlers as an accelerator target.
28 class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget { 28 class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
29 public: 29 public:
30 AcceleratorController(); 30 AcceleratorController();
31 virtual ~AcceleratorController(); 31 virtual ~AcceleratorController();
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 scoped_ptr<ScreenshotDelegate> screenshot_delegate_; 65 scoped_ptr<ScreenshotDelegate> screenshot_delegate_;
66 66
67 // A map from accelerators to the AcceleratorAction values, which are used in 67 // A map from accelerators to the AcceleratorAction values, which are used in
68 // the implementation. 68 // the implementation.
69 std::map<ui::Accelerator, int> accelerators_; 69 std::map<ui::Accelerator, int> accelerators_;
70 70
71 DISALLOW_COPY_AND_ASSIGN(AcceleratorController); 71 DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
72 }; 72 };
73 73
74 } // namespace aura_shell 74 } // namespace ash
75 75
76 #endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ 76 #endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698