Do not allow split view to be engaged by a bezel gesture

athena/wm/split_view_controller.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
 #define ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
 
 #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"
 #include "base/memory/weak_ptr.h"
 
 namespace gfx {
 class Rect;
 class Transform;
 }
 
 namespace aura {
 class ScopedWindowTargeter;
 class Window;
 class WindowTargeter;
 }
 
 namespace views {
 class ViewTargeterDelegate;
 class Widget;
 }
 
 namespace athena {
 class SplitViewControllerTest;
 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:
   SplitViewController(aura::Window* container,
                       WindowListProviderImpl* window_list_provider);
 
   ~SplitViewController() override;
 
   bool CanActivateSplitViewMode() const;
   bool IsSplitViewModeActive() const;
@@ skipping 59 matching lines @@
   void OnAnimationCompleted();
 
   // Returns the default divider position for when the split view mode is
   // active and the divider is not being dragged.
   int GetDefaultDividerPosition();
 
   // Access to constants in anonymous namespace for testing purposes.
   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;
   void HandleScrollUpdate(float delta) override;
 
   // WindowManagerObserver:
   void OnOverviewModeEnter() override;
   void OnOverviewModeExit() override;
   void OnSplitViewModeEnter() override;
   void OnSplitViewModeExit() override;
@@ skipping 39 matching lines @@
   std::vector<aura::Window*> to_hide_;
 
   base::WeakPtrFactory<SplitViewController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SplitViewController);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_