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

athena/wm/split_view_controller.cc

 // 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.
 
 #include "athena/wm/split_view_controller.h"
 
 #include <cmath>
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/wm/public/window_manager.h"
@@ skipping 537 matching lines @@
 
 float SplitViewController::GetMaxDistanceFromMiddleForTest() const {
   return kMaxDistanceFromMiddle;
 }
 
 float SplitViewController::GetMinFlingVelocityForTest() const {
   return kMinFlingVelocity;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// BezelController::ScrollDelegate:
+// DragHandleScrollDelegate:
 
-void SplitViewController::BezelScrollBegin(BezelController::Bezel bezel,
-                                           float delta) {
-  if (!BezelCanScroll())
-    return;
-
-  SetState(SCROLLING);
-
-  const aura::Window::Windows& windows = window_list_provider_->GetWindowList();
-  CHECK(windows.size() >= 2);
-  aura::Window::Windows::const_reverse_iterator iter = windows.rbegin();
-  aura::Window* current_window = *(iter);
-
-  if (delta > 0) {
-    right_window_ = current_window;
-    left_window_ = *(iter + 1);
-  } else {
-    left_window_ = current_window;
-    right_window_ = *(iter + 1);
-  }
-
-  CHECK(left_window_);
-  CHECK(right_window_);
-
-  // Calculate divider_scroll_start_position_
-  gfx::Screen* screen = gfx::Screen::GetScreenFor(container_);
-  const gfx::Rect& display_bounds =
-      screen->GetDisplayNearestWindow(container_).bounds();
-  gfx::Rect container_bounds = container_->GetBoundsInScreen();
-  divider_scroll_start_position_ =
-      delta > 0 ? display_bounds.x() - container_bounds.x()
-                : display_bounds.right() - container_bounds.x();
-
+void SplitViewController::HandleScrollBegin(float delta) {
+  CHECK(state_ == ACTIVE);
+  state_ = SCROLLING;
+  divider_scroll_start_position_ = GetDefaultDividerPosition();
   divider_position_ = divider_scroll_start_position_ + delta;
   UpdateLayout(false);
 }
 
-void SplitViewController::BezelScrollEnd(float velocity) {
+void SplitViewController::HandleScrollEnd(float velocity) {
   if (state_ != SCROLLING)
     return;
 
   int delta = GetDefaultDividerPosition() - divider_position_;
   WindowToActivate window = WINDOW_NONE;
   if (std::abs(velocity) > kMinFlingVelocity)
     window = velocity > 0 ? WINDOW_LEFT : WINDOW_RIGHT;
   else if (std::abs(delta) > kMaxDistanceFromMiddle)
     window = delta > 0 ? WINDOW_RIGHT : WINDOW_LEFT;
 
@@ skipping 10 matching lines @@
     case WINDOW_RIGHT:
       divider_position_ = 0;
       SetState(INACTIVE);
       wm::ActivateWindow(right_window_);
       break;
   }
 
   UpdateLayout(true);
 }
 
-void SplitViewController::BezelScrollUpdate(float delta) {
+void SplitViewController::HandleScrollUpdate(float delta) {
   if (state_ != SCROLLING)
     return;
   divider_position_ = divider_scroll_start_position_ + delta;
   UpdateLayout(false);
 }
 
-bool SplitViewController::BezelCanScroll() {
-  return CanActivateSplitViewMode();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// DragHandleScrollDelegate:
-
-void SplitViewController::HandleScrollBegin(float delta) {
-  CHECK(state_ == ACTIVE);
-  state_ = SCROLLING;
-  divider_scroll_start_position_ = GetDefaultDividerPosition();
-  divider_position_ = divider_scroll_start_position_ + delta;
-  UpdateLayout(false);
-}
-
-void SplitViewController::HandleScrollEnd(float velocity) {
-  BezelScrollEnd(velocity);
-}
-
-void SplitViewController::HandleScrollUpdate(float delta) {
-  BezelScrollUpdate(delta);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // WindowManagerObserver:
 
 void SplitViewController::OnOverviewModeEnter() {
   if (divider_widget_)
     HideDivider();
 }
 
 void SplitViewController::OnOverviewModeExit() {
   if (state_ != INACTIVE)
     ShowDivider();
 }
 
 void SplitViewController::OnSplitViewModeEnter() {
 }
 
 void SplitViewController::OnSplitViewModeExit() {
 }
 
 }  // namespace athena