Index: athena/wm/split_view_controller.h |
diff --git a/athena/wm/split_view_controller.h b/athena/wm/split_view_controller.h |
index d7dc20c0328f821e755a97051add5040b56fdf7b..e0ed602973f2098a20a3c97e3091fe37710e6914 100644 |
--- a/athena/wm/split_view_controller.h |
+++ b/athena/wm/split_view_controller.h |
@@ -6,8 +6,6 @@ |
#define ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ |
#include "athena/wm/bezel_controller.h" |
-#include "athena/wm/public/window_manager_observer.h" |
-#include "athena/wm/window_overview_mode.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
@@ -17,17 +15,13 @@ class Transform; |
namespace athena { |
class WindowListProvider; |
-class WindowManager; |
-class WindowOverviewModeDelegate; |
// Responsible for entering split view mode, exiting from split view mode, and |
// laying out the windows in split view mode. |
-class SplitViewController : public BezelController::ScrollDelegate, |
- public WindowManagerObserver { |
+class SplitViewController : public BezelController::ScrollDelegate { |
public: |
SplitViewController(aura::Window* container, |
- WindowListProvider* window_list_provider, |
- WindowManager* window_manager); |
+ WindowListProvider* window_list_provider); |
virtual ~SplitViewController(); |
@@ -62,37 +56,19 @@ class SplitViewController : public BezelController::ScrollDelegate, |
void UpdateSeparatorPositionFromScrollDelta(float delta); |
- // Returns the current activity shown to the user. Persists through the |
- // SCROLLING and ACTIVE states and gets updated if the current activity goes |
- // off screen when the user switches between activities. |
- aura::Window* GetCurrentActivityWindow(); |
- |
- // BezelController::ScrollDelegate overrides. |
+ // BezelController::ScrollDelegate: |
virtual void ScrollBegin(BezelController::Bezel bezel, float delta) OVERRIDE; |
virtual void ScrollEnd() OVERRIDE; |
virtual void ScrollUpdate(float delta) OVERRIDE; |
virtual bool CanScroll() OVERRIDE; |
- // WindowManagerObserver |
- virtual void OnOverviewModeEnter() OVERRIDE; |
- virtual void OnOverviewModeExit() OVERRIDE; |
- |
State state_; |
aura::Window* container_; |
- // Window Manager which owns this SplitViewController. |
- // Must be non NULL for the duration of the lifetime. |
- WindowManager* window_manager_; |
- |
// Provider of the list of windows to cycle through. Not owned. |
WindowListProvider* window_list_provider_; |
- // Keeps track of the current activity shown as the user switches between |
- // activities. Persists through the SCROLLING and ACTIVE states. Gets reset |
- // to NULL when overview mode is activated. |
- aura::Window* current_activity_window_; |
- |
// Windows for the left and right activities shown in SCROLLING and ACTIVE |
// states. In INACTIVE state these are NULL. |
aura::Window* left_window_; |