| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index 5bd0fbf3ed473a1d6ab5eafaacc7c983bd0d3965..4b1fc89fe29a2caab21dd52ba39a019c0e4a29da 100644
|
| --- a/ash/shell.h
|
| +++ b/ash/shell.h
|
| @@ -78,6 +78,7 @@ class MagnificationController;
|
| class NestedDispatcherController;
|
| class PartialMagnificationController;
|
| class PowerButtonController;
|
| +class RootWindowHostFactory;
|
| class ScreenAsh;
|
| class SessionStateController;
|
| class ShellDelegate;
|
| @@ -423,6 +424,10 @@ class ASH_EXPORT Shell
|
|
|
| aura::client::StackingClient* stacking_client();
|
|
|
| + RootWindowHostFactory* root_window_host_factory() {
|
| + return root_window_host_factory_.get();
|
| + }
|
| +
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
|
| FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
|
| @@ -519,6 +524,7 @@ class ASH_EXPORT Shell
|
| scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
|
| scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
|
| scoped_ptr<internal::EventClientImpl> event_client_;
|
| + scoped_ptr<RootWindowHostFactory> root_window_host_factory_;
|
|
|
| // An event filter that rewrites or drops an event.
|
| scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
|
|
|