| Index: ash/root_window_controller.h
|
| diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
|
| index 1dcf688f7eaefc07177170d23bc1b861c5052682..afe2f2799b7d21877aa01f7e4d4ac3fbd26b72e1 100644
|
| --- a/ash/root_window_controller.h
|
| +++ b/ash/root_window_controller.h
|
| @@ -57,6 +57,7 @@ class DesktopBackgroundWidgetController;
|
| class DockedWindowLayoutManager;
|
| class PanelLayoutManager;
|
| class RootWindowLayoutManager;
|
| +class Shelf;
|
| class ShelfLayoutManager;
|
| class ShelfWidget;
|
| class StackingController;
|
| @@ -124,6 +125,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
|
|
|
| // Access the shelf widget associated with this root window controller,
|
| // NULL if no such shelf exists.
|
| + // DEPRECATED: Prefer GetShelf()->shelf_widget().
|
| ShelfWidget* shelf_widget() { return shelf_widget_.get(); }
|
|
|
| // Get touch HUDs associated with this root window controller.
|
| @@ -182,11 +184,15 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
|
| const aura::Window* GetContainer(int container_id) const;
|
|
|
| // Show shelf view if it was created hidden (before session has started).
|
| + // TODO(jamescook): Eliminate this and handle show via Shelf.
|
| void ShowShelf();
|
|
|
| // Creates the shelf for this root window and notifies observers.
|
| void CreateShelf();
|
|
|
| + // Returns the shelf controller for this root window.
|
| + Shelf* GetShelf() const;
|
| +
|
| // Called when the login status changes after login (such as lock/unlock).
|
| // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
|
| void UpdateAfterLoginStatusChange(user::LoginStatus status);
|
|
|