| Index: ash/root_window_controller.h
|
| diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
|
| index f8855a7fdc105332b4c6ac5df6be187fd60f6e13..79c5f5e06b597215d6d44e99c3c64813fe7bbfce 100644
|
| --- a/ash/root_window_controller.h
|
| +++ b/ash/root_window_controller.h
|
| @@ -43,6 +43,7 @@ class ToplevelWindowEventHandler;
|
| namespace internal {
|
|
|
| class BootSplashScreen;
|
| +class DockedWindowLayoutManager;
|
| class PanelLayoutManager;
|
| class RootWindowLayoutManager;
|
| class ScreenDimmer;
|
| @@ -192,6 +193,9 @@ class ASH_EXPORT RootWindowController {
|
| // The shelf for managing the launcher and the status widget.
|
| scoped_ptr<ShelfWidget> shelf_;
|
|
|
| + // Manages layout of docked windows. Owned by DockedContainer.
|
| + DockedWindowLayoutManager* docked_layout_manager_;
|
| +
|
| // Manages layout of panels. Owned by PanelContainer.
|
| PanelLayoutManager* panel_layout_manager_;
|
|
|
| @@ -211,6 +215,7 @@ class ASH_EXPORT RootWindowController {
|
| scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_;
|
| scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_;
|
| scoped_ptr<ToplevelWindowEventHandler> panel_container_handler_;
|
| + scoped_ptr<ToplevelWindowEventHandler> docked_container_handler_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RootWindowController);
|
| };
|
|
|