| Index: athena/wm/split_view_controller.h
|
| diff --git a/athena/wm/split_view_controller.h b/athena/wm/split_view_controller.h
|
| index 8da798f11fc828b7810e2a517f0d0cd10528e1a3..a0fbe161bd7c468c73d688f63c03ac55ff505826 100644
|
| --- a/athena/wm/split_view_controller.h
|
| +++ b/athena/wm/split_view_controller.h
|
| @@ -7,7 +7,6 @@
|
|
|
| #include "athena/athena_export.h"
|
| #include "athena/util/drag_handle.h"
|
| -#include "athena/wm/bezel_controller.h"
|
| #include "athena/wm/public/window_list_provider_observer.h"
|
| #include "athena/wm/public/window_manager_observer.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -36,8 +35,7 @@ class WindowListProviderImpl;
|
| // Responsible for entering split view mode, exiting from split view mode, and
|
| // laying out the windows in split view mode.
|
| class ATHENA_EXPORT SplitViewController
|
| - : public BezelController::ScrollDelegate,
|
| - public DragHandleScrollDelegate,
|
| + : public DragHandleScrollDelegate,
|
| public WindowManagerObserver,
|
| public WindowListProviderObserver {
|
| public:
|
| @@ -117,12 +115,6 @@ class ATHENA_EXPORT SplitViewController
|
| float GetMaxDistanceFromMiddleForTest() const;
|
| float GetMinFlingVelocityForTest() const;
|
|
|
| - // BezelController::ScrollDelegate:
|
| - void BezelScrollBegin(BezelController::Bezel bezel, float delta) override;
|
| - void BezelScrollEnd(float velocity) override;
|
| - void BezelScrollUpdate(float delta) override;
|
| - bool BezelCanScroll() override;
|
| -
|
| // DragHandleScrollDelegate:
|
| void HandleScrollBegin(float delta) override;
|
| void HandleScrollEnd(float velocity) override;
|
|
|