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

Unified Diff: ash/shell.h

Issue 10332145: aura/ash split: Moves RootWindowEventFilter and InputMethodEventFilter to ui/aura/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved to ui/aura/shared/ Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 163dbc7b586e54a87a02a6230b78c1df5813f9eb..c2fb5a9f04f16c4077e47751b19f906830fb2ed9 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -28,6 +28,10 @@ class EventFilter;
class Monitor;
class RootWindow;
class Window;
+namespace shared {
+class InputMethodEventFilter;
+class RootWindowEventFilter;
+}
}
namespace content {
class BrowserContext;
@@ -68,14 +72,12 @@ class AppListController;
class DragDropController;
class EventClientImpl;
class FocusCycler;
-class InputMethodEventFilter;
class KeyRewriterEventFilter;
class MagnificationController;
class MonitorController;
class PanelLayoutManager;
class PartialScreenshotEventFilter;
class ResizeShadowController;
-class RootWindowEventFilter;
class RootWindowLayoutManager;
class ScreenDimmer;
class ShadowController;
@@ -107,7 +109,7 @@ class ASH_EXPORT Shell {
explicit TestApi(Shell* shell);
internal::RootWindowLayoutManager* root_window_layout();
- internal::InputMethodEventFilter* input_method_event_filter();
+ aura::shared::InputMethodEventFilter* input_method_event_filter();
internal::SystemGestureEventFilter* system_gesture_event_filter();
internal::WorkspaceController* workspace_controller();
@@ -200,7 +202,7 @@ class ASH_EXPORT Shell {
}
#endif // !defined(OS_MACOSX)
- internal::RootWindowEventFilter* root_filter() {
+ aura::shared::RootWindowEventFilter* root_filter() {
return root_filter_;
}
internal::TooltipController* tooltip_controller() {
@@ -310,7 +312,7 @@ class ASH_EXPORT Shell {
scoped_ptr<aura::RootWindow> root_window_;
ScreenAsh* screen_;
- internal::RootWindowEventFilter* root_filter_; // not owned
+ aura::shared::RootWindowEventFilter* root_filter_; // not owned
std::vector<WindowAndBoundsPair> to_restore_;
@@ -364,7 +366,7 @@ class ASH_EXPORT Shell {
#endif
// An event filter that pre-handles all key events to send them to an IME.
- scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;
+ scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
// The shelf for managing the launcher and the status widget in non-compact
// mode. Shell does not own the shelf. Instead, it is owned by container of
« no previous file with comments | « ash/ime/input_method_event_filter_unittest.cc ('k') | ash/shell.cc » ('j') | ash/shell.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698