Merge from Chromium at DEPS revision 263965
This commit was generated by merge_to_master.py.
Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
diff --git a/ash/shell.h b/ash/shell.h
index 3a29e29..56af8d1 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -145,7 +145,6 @@
class WindowCycleController;
class WindowPositioner;
class WindowSelectorController;
-class WindowTreeHostFactory;
namespace shell {
class WindowWatcher;
@@ -302,6 +301,9 @@
// their original position.
void OnMaximizeModeEnded();
+ // Called when a root window is created.
+ void OnRootWindowAdded(aura::Window* root_window);
+
// Initializes |shelf_|. Does nothing if it's already initialized.
void CreateShelf();
@@ -515,10 +517,6 @@
}
#endif // defined(OS_CHROMEOS)
- WindowTreeHostFactory* window_tree_host_factory() {
- return window_tree_host_factory_.get();
- }
-
ShelfModel* shelf_model() {
return shelf_model_.get();
}
@@ -652,12 +650,12 @@
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.