summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-11 08:13:45 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-11 08:13:45 +0000
commitf5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9 (patch)
tree57061cf0622e2b9edee2428ac332de8967bccdea /ash/shell.h
parent728f28f2dfd7e22a414a8657229af008a19d7a9d (diff)
downloadchromium_src-f5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9.zip
chromium_src-f5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9.tar.gz
chromium_src-f5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9.tar.bz2
Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash.
Other notable changes: * Removed WindowTreeHostFactory as this is no longer necessary. * Moved RootWindowTransformer to ash/host * Removed Set/GetInsets which are no longer necessary (a code in SetInsets is now a part of SetRootWindowTransformer) * Added TransformerHelper that implements common behavior to transform root window for AshWindowTreeHost * Added DEPS files * Updated metro_viewer code to make sure it creates ash::AshRemoteWindowHostTree A few more simplifications to come: * Simplify RootWindowTransformer * Eliminate EnvObserver in AshWindowTreeHostX11 I'll also work on DEPS reorg to make it more explicit under ash/ BUG=355771 TEST=No functional change. ui/aura/window_tree_host_x11_unittests has been moved to ash/host/ash_window_tree_host_x11_unittests Review URL: https://codereview.chromium.org/201573015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/ash/shell.h b/ash/shell.h
index 3a29e29e..ba9ddfd 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -145,7 +145,6 @@ class WebNotificationTray;
class WindowCycleController;
class WindowPositioner;
class WindowSelectorController;
-class WindowTreeHostFactory;
namespace shell {
class WindowWatcher;
@@ -515,10 +514,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
}
#endif // defined(OS_CHROMEOS)
- WindowTreeHostFactory* window_tree_host_factory() {
- return window_tree_host_factory_.get();
- }
-
ShelfModel* shelf_model() {
return shelf_model_.get();
}
@@ -652,12 +647,12 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
scoped_ptr<AutoclickController> autoclick_controller_;
scoped_ptr<aura::client::FocusClient> focus_client_;
aura::client::ActivationClient* activation_client_;
+
scoped_ptr<MouseCursorEventFilter> mouse_cursor_filter_;
scoped_ptr<ScreenPositionController> screen_position_controller_;
scoped_ptr<SystemModalContainerEventFilter> modality_filter_;
scoped_ptr<EventClientImpl> event_client_;
scoped_ptr<EventTransformationHandler> event_transformation_handler_;
- scoped_ptr<WindowTreeHostFactory> window_tree_host_factory_;
// An event filter that pre-handles key events while the partial
// screenshot UI or the keyboard overlay is active.