Chromium Code Reviews| Index: ash/shelf/shelf_layout_manager.h |
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h |
| index 8e1d30b34401e074455e91bc3097ef1cee289866..f966cf4eac5e6ba9b60c198b9459d499f9e9b0fc 100644 |
| --- a/ash/shelf/shelf_layout_manager.h |
| +++ b/ash/shelf/shelf_layout_manager.h |
| @@ -8,6 +8,7 @@ |
| #include <vector> |
| #include "ash/ash_export.h" |
| +#include "ash/session_state_observer.h" |
| #include "ash/shelf/background_animator.h" |
| #include "ash/shelf/shelf.h" |
| #include "ash/shelf/shelf_types.h" |
| @@ -60,7 +61,8 @@ class ASH_EXPORT ShelfLayoutManager : |
| public aura::client::ActivationChangeObserver, |
| public DockedWindowLayoutManagerObserver, |
| public keyboard::KeyboardControllerObserver, |
| - public LockStateObserver { |
| + public LockStateObserver, |
| + public SessionStateObserver { |
| public: |
| // We reserve a small area on the edge of the workspace area to ensure that |
| @@ -191,6 +193,10 @@ class ASH_EXPORT ShelfLayoutManager : |
| // Overridden from ash::LockStateObserver: |
| virtual void OnLockStateEvent(LockStateObserver::EventType event) OVERRIDE; |
| + // Overridden from ash::SessionStateChanged: |
|
Daniel Erat
2014/04/11 14:43:41
s/SessionStateChanged/SessionStateObserver/
Nikita (slow)
2014/04/14 08:53:16
Done.
|
| + virtual void SessionStateChanged( |
| + SessionStateDelegate::SessionState state) OVERRIDE; |
| + |
| // TODO(harrym|oshima): These templates will be moved to |
| // new Shelf class. |
| // A helper function that provides a shortcut for choosing |