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

Side by Side Diff: ash/shell.h

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move to ash/ime/ Created 8 years, 12 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
« no previous file with comments | « ash/ime/input_method_event_filter_unittest.cc ('k') | ash/shell.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_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 22 matching lines...) Expand all
33 33
34 class AcceleratorController; 34 class AcceleratorController;
35 class Launcher; 35 class Launcher;
36 class ShellDelegate; 36 class ShellDelegate;
37 37
38 namespace internal { 38 namespace internal {
39 class ActivationController; 39 class ActivationController;
40 class AcceleratorFilter; 40 class AcceleratorFilter;
41 class AppList; 41 class AppList;
42 class DragDropController; 42 class DragDropController;
43 class InputMethodEventFilter;
43 class ShadowController; 44 class ShadowController;
44 class StackingController; 45 class StackingController;
45 class TooltipController; 46 class TooltipController;
46 class WorkspaceController; 47 class WorkspaceController;
47 } 48 }
48 49
49 // Shell is a singleton object that presents the Shell API and implements the 50 // Shell is a singleton object that presents the Shell API and implements the
50 // RootWindow's delegate interface. 51 // RootWindow's delegate interface.
51 class ASH_EXPORT Shell { 52 class ASH_EXPORT Shell {
52 public: 53 public:
53 // Upon creation, the Shell sets itself as the RootWindow's delegate, which 54 // Upon creation, the Shell sets itself as the RootWindow's delegate, which
54 // takes ownership of the Shell. 55 // takes ownership of the Shell.
55 56
56 // A shell must be explicitly created so that it can call |Init()| with the 57 // A shell must be explicitly created so that it can call |Init()| with the
57 // delegate set. |delegate| can be NULL (if not required for initialization). 58 // delegate set. |delegate| can be NULL (if not required for initialization).
58 static Shell* CreateInstance(ShellDelegate* delegate); 59 static Shell* CreateInstance(ShellDelegate* delegate);
59 60
60 // Should never be called before |CreateInstance()|. 61 // Should never be called before |CreateInstance()|.
61 static Shell* GetInstance(); 62 static Shell* GetInstance();
62 63
63 static void DeleteInstance(); 64 static void DeleteInstance();
64 65
65 aura::Window* GetContainer(int container_id); 66 aura::Window* GetContainer(int container_id);
66 const aura::Window* GetContainer(int container_id) const; 67 const aura::Window* GetContainer(int container_id) const;
67 68
68 // Adds or removes |filter| from the RootWindowEventFilter. 69 // Adds or removes |filter| from the RootWindowEventFilter.
69 void AddRootWindowEventFilter(aura::EventFilter* filter); 70 void AddRootWindowEventFilter(aura::EventFilter* filter);
70 void RemoveRootWindowEventFilter(aura::EventFilter* filter); 71 void RemoveRootWindowEventFilter(aura::EventFilter* filter);
72 size_t GetRootWindowEventFilterCount() const;
71 73
72 // Toggles between overview mode and normal mode. 74 // Toggles between overview mode and normal mode.
73 void ToggleOverview(); 75 void ToggleOverview();
74 76
75 // Toggles app list. 77 // Toggles app list.
76 void ToggleAppList(); 78 void ToggleAppList();
77 79
78 // Returns true if the screen is locked. 80 // Returns true if the screen is locked.
79 bool IsScreenLocked() const; 81 bool IsScreenLocked() const;
80 82
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 132
131 scoped_ptr<internal::AppList> app_list_; 133 scoped_ptr<internal::AppList> app_list_;
132 134
133 scoped_ptr<internal::StackingController> stacking_controller_; 135 scoped_ptr<internal::StackingController> stacking_controller_;
134 scoped_ptr<internal::ActivationController> activation_controller_; 136 scoped_ptr<internal::ActivationController> activation_controller_;
135 scoped_ptr<internal::DragDropController> drag_drop_controller_; 137 scoped_ptr<internal::DragDropController> drag_drop_controller_;
136 scoped_ptr<internal::WorkspaceController> workspace_controller_; 138 scoped_ptr<internal::WorkspaceController> workspace_controller_;
137 scoped_ptr<internal::ShadowController> shadow_controller_; 139 scoped_ptr<internal::ShadowController> shadow_controller_;
138 scoped_ptr<internal::TooltipController> tooltip_controller_; 140 scoped_ptr<internal::TooltipController> tooltip_controller_;
139 141
142 // An event filter that pre-handles all key events to send them to an IME.
143 scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;
140 // An event filter that pre-handles global accelerators. 144 // An event filter that pre-handles global accelerators.
141 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_; 145 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_;
142 146
143 147
144 DISALLOW_COPY_AND_ASSIGN(Shell); 148 DISALLOW_COPY_AND_ASSIGN(Shell);
145 }; 149 };
146 150
147 } // namespace ash 151 } // namespace ash
148 152
149 #endif // ASH_SHELL_H_ 153 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ime/input_method_event_filter_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698