Index: ash/common/wm_shell.h |
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h |
index ae07822cef817eaf1e236534248dbc1e84e4e14e..a5589c97dc72bbb9f31cfa895da91c242b77ccf4 100644 |
--- a/ash/common/wm_shell.h |
+++ b/ash/common/wm_shell.h |
@@ -13,7 +13,6 @@ |
#include "ash/ash_export.h" |
#include "ash/common/metrics/gesture_action_type.h" |
#include "ash/common/metrics/user_metrics_action.h" |
-#include "ash/common/session/session_state_observer.h" |
#include "ash/common/wm/lock_state_observer.h" |
#include "base/observer_list.h" |
#include "components/ui_devtools/devtools_server.h" |
@@ -102,7 +101,7 @@ |
} |
// Similar to ash::Shell. Eventually the two will be merged. |
-class ASH_EXPORT WmShell : public SessionStateObserver { |
+class ASH_EXPORT WmShell { |
public: |
// This is necessary for a handful of places that is difficult to plumb |
// through context. |
@@ -354,9 +353,11 @@ |
virtual std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() = 0; |
- // Creates the ShelfView for each display and populates it with items. |
- // TODO(jamescook): Rename this. http://crbug.com/679925 |
+ // Initializes the appropriate shelves. Does nothing for any existing shelves. |
void CreateShelf(); |
+ |
+ // Show shelf view if it was created hidden (before session has started). |
+ void ShowShelf(); |
void CreateShelfDelegate(); |
@@ -446,7 +447,7 @@ |
protected: |
explicit WmShell(std::unique_ptr<ShellDelegate> shell_delegate); |
- ~WmShell() override; |
+ virtual ~WmShell(); |
base::ObserverList<ShellObserver>* shell_observers() { |
return &shell_observers_; |
@@ -473,9 +474,6 @@ |
void SetAcceleratorController( |
std::unique_ptr<AcceleratorController> accelerator_controller); |
- |
- // SessionStateObserver: |
- void SessionStateChanged(session_manager::SessionState state) override; |
private: |
friend class AcceleratorControllerTest; |