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

Side by Side Diff: ui/aura_shell/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: moved IME code to aura_shell, not ready for review though 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
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_H_ 5 #ifndef UI_AURA_SHELL_SHELL_H_
6 #define UI_AURA_SHELL_SHELL_H_ 6 #define UI_AURA_SHELL_SHELL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 16 matching lines...) Expand all
27 namespace aura_shell { 27 namespace aura_shell {
28 28
29 class Launcher; 29 class Launcher;
30 class ShellAcceleratorController; 30 class ShellAcceleratorController;
31 class ShellDelegate; 31 class ShellDelegate;
32 class ShellTooltipManager; 32 class ShellTooltipManager;
33 33
34 namespace internal { 34 namespace internal {
35 class AppList; 35 class AppList;
36 class DragDropController; 36 class DragDropController;
37 class InputMethodEventFilter;
37 class ShadowController; 38 class ShadowController;
38 class ShellAcceleratorFilter; 39 class ShellAcceleratorFilter;
39 class WorkspaceController; 40 class WorkspaceController;
40 } 41 }
41 42
42 // Shell is a singleton object that presents the Shell API and implements the 43 // Shell is a singleton object that presents the Shell API and implements the
43 // RootWindow's delegate interface. 44 // RootWindow's delegate interface.
44 class AURA_SHELL_EXPORT Shell { 45 class AURA_SHELL_EXPORT Shell {
45 public: 46 public:
46 // Upon creation, the Shell sets itself as the RootWindow's delegate, which 47 // Upon creation, the Shell sets itself as the RootWindow's delegate, which
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 scoped_ptr<ShellDelegate> delegate_; 107 scoped_ptr<ShellDelegate> delegate_;
107 108
108 scoped_ptr<Launcher> launcher_; 109 scoped_ptr<Launcher> launcher_;
109 110
110 scoped_ptr<internal::AppList> app_list_; 111 scoped_ptr<internal::AppList> app_list_;
111 112
112 scoped_ptr<internal::DragDropController> drag_drop_controller_; 113 scoped_ptr<internal::DragDropController> drag_drop_controller_;
113 scoped_ptr<internal::WorkspaceController> workspace_controller_; 114 scoped_ptr<internal::WorkspaceController> workspace_controller_;
114 scoped_ptr<internal::ShadowController> shadow_controller_; 115 scoped_ptr<internal::ShadowController> shadow_controller_;
115 116
117 // ...
118 scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;
116 // An event filter that pre-handles global accelerators. 119 // An event filter that pre-handles global accelerators.
117 scoped_ptr<internal::ShellAcceleratorFilter> accelerator_filter_; 120 scoped_ptr<internal::ShellAcceleratorFilter> accelerator_filter_;
118 121
119 scoped_ptr<ShellTooltipManager> tooltip_manager_; 122 scoped_ptr<ShellTooltipManager> tooltip_manager_;
120 123
121 DISALLOW_COPY_AND_ASSIGN(Shell); 124 DISALLOW_COPY_AND_ASSIGN(Shell);
122 }; 125 };
123 126
124 } // namespace aura_shell 127 } // namespace aura_shell
125 128
126 #endif // UI_AURA_SHELL_SHELL_H_ 129 #endif // UI_AURA_SHELL_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698