Revert of Adding split view divider widget.

athena/wm/bezel_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/bezel_controller.h"
 
 #include "ui/aura/window.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point_conversions.h"
@@ skipping 28 matching lines @@
   DCHECK(bezel == BezelController::BEZEL_LEFT ||
          bezel == BezelController::BEZEL_RIGHT);
   // Convert location from window coordinates to screen coordinates.
   gfx::Point point_in_screen(gfx::ToRoundedPoint(location));
   wm::ConvertPointToScreen(window, &point_in_screen);
   return bezel == BezelController::BEZEL_LEFT
              ? point_in_screen.x()
              : point_in_screen.x() - GetDisplay(window).bounds().width();
 }
 
-// Returns the bezel corresponding to the |location| in |window| or BEZEL_NONE
-// if the location is outside of the bezel area.
-// Only implemented for LEFT and RIGHT bezels.
-BezelController::Bezel GetBezel(const gfx::PointF& location,
-                                aura::Window* window) {
-  int screen_width = GetDisplay(window).bounds().width();
-  gfx::Point point_in_screen(gfx::ToRoundedPoint(location));
-  wm::ConvertPointToScreen(window, &point_in_screen);
-  if (point_in_screen.x() < kBezelWidth)
-    return BezelController::BEZEL_LEFT;
-  if (point_in_screen.x() > screen_width - kBezelWidth)
-    return BezelController::BEZEL_RIGHT;
-  return BezelController::BEZEL_NONE;
-}
-
 }  // namespace
 
 BezelController::BezelController(aura::Window* container)
     : container_(container),
       state_(NONE),
       scroll_bezel_(BEZEL_NONE),
       scroll_target_(NULL),
       left_right_delegate_(NULL) {
 }
 
 void BezelController::SetState(BezelController::State state) {
   // Use SetState(State, float) if |state| is one of the BEZEL_SCROLLING states.
   DCHECK_NE(state, BEZEL_SCROLLING_TWO_FINGERS);
   DCHECK_NE(state, BEZEL_SCROLLING_ONE_FINGER);
   SetState(state, kScrollDeltaNone);
 }
 
 void BezelController::SetState(BezelController::State state,
                                float scroll_delta) {
   if (!left_right_delegate_ || state == state_)
     return;
 
   if (state == BEZEL_SCROLLING_TWO_FINGERS)
-    left_right_delegate_->BezelScrollBegin(scroll_bezel_, scroll_delta);
+    left_right_delegate_->ScrollBegin(scroll_bezel_, scroll_delta);
   else if (state_ == BEZEL_SCROLLING_TWO_FINGERS)
-    left_right_delegate_->BezelScrollEnd();
+    left_right_delegate_->ScrollEnd();
   state_ = state;
   if (state == NONE) {
     scroll_bezel_ = BEZEL_NONE;
     scroll_target_ = NULL;
   }
 }
 
+// Only implemented for LEFT and RIGHT bezels ATM.
+BezelController::Bezel BezelController::GetBezel(const gfx::PointF& location) {
+  int screen_width = GetDisplay(container_).bounds().width();
+  if (location.x() < kBezelWidth) {
+    return BEZEL_LEFT;
+  } else if (location.x() > screen_width - kBezelWidth) {
+    return BEZEL_RIGHT;
+  } else {
+    return BEZEL_NONE;
+  }
+}
+
 void BezelController::OnGestureEvent(ui::GestureEvent* event) {
   // TODO(mfomitchev): Currently we aren't retargetting or consuming any of the
   // touch events. This means that content can prevent the generation of gesture
   // events and two-finger scroll won't work. Possible solution to this problem
   // is hosting our own gesture recognizer or retargetting touch events at the
   // bezel.
 
   if (!left_right_delegate_)
     return;
 
   ui::EventType type = event->type();
   if (!ShouldProcessGesture(type))
     return;
 
-  const ui::GestureEventDetails& event_details = event->details();
-  int num_touch_points = event_details.touch_points();
-  if (num_touch_points == 1 && type == ui::ET_GESTURE_BEGIN) {
-    // Reset the state when the first finger touches and starts a gesture.
-    // Normally, the state gets reset when the last finger is lifted and we
-    // receive ET_GESTURE_END. However ET_GESTURE_END doesn't always get
-    // dispatched. (E.g. if the gesture target was hidden or deleted).
-    // Since we can't rely on receiving ET_GESTURE_END when the last finger is
-    // lifted, we also reset the state on ET_GESTURE_BEGIN when the first
-    // finger touches the screen.
-    SetState(NONE);
-  }
-
   if (scroll_target_ && event->target() != scroll_target_)
     return;
 
   const gfx::PointF& event_location = event->location_f();
+  const ui::GestureEventDetails& event_details = event->details();
+  int num_touch_points = event_details.touch_points();
   float scroll_delta = kScrollDeltaNone;
-  aura::Window* target_window = static_cast<aura::Window*>(event->target());
-  if (scroll_bezel_ != BEZEL_NONE)
+  if (scroll_bezel_ != BEZEL_NONE) {
+    aura::Window* target_window = static_cast<aura::Window*>(event->target());
     scroll_delta = GetDistance(event_location, target_window, scroll_bezel_);
+  }
 
   if (type == ui::ET_GESTURE_BEGIN) {
     if (num_touch_points > 2) {
       SetState(IGNORE_CURRENT_SCROLL);
       return;
     }
-    BezelController::Bezel event_bezel =
-        GetBezel(event->location_f(), target_window);
+    BezelController::Bezel event_bezel = GetBezel(event->location_f());
     switch (state_) {
       case NONE:
         scroll_bezel_ = event_bezel;
         scroll_target_ = event->target();
         if (event_bezel != BEZEL_LEFT && event_bezel != BEZEL_RIGHT)
           SetState(IGNORE_CURRENT_SCROLL);
         else
           SetState(BEZEL_GESTURE_STARTED);
         break;
       case IGNORE_CURRENT_SCROLL:
@@ skipping 31 matching lines @@
     if (state_ != BEZEL_GESTURE_STARTED)
       return;
 
     if (num_touch_points == 1) {
       SetState(BEZEL_SCROLLING_ONE_FINGER, scroll_delta);
       return;
     }
 
     DCHECK_EQ(num_touch_points, 2);
     SetState(BEZEL_SCROLLING_TWO_FINGERS, scroll_delta);
-    if (left_right_delegate_->BezelCanScroll())
+    if (left_right_delegate_->CanScroll())
       event->SetHandled();
   } else if (type == ui::ET_GESTURE_SCROLL_UPDATE) {
     if (state_ != BEZEL_SCROLLING_TWO_FINGERS)
       return;
 
-    left_right_delegate_->BezelScrollUpdate(scroll_delta);
-    if (left_right_delegate_->BezelCanScroll())
+    left_right_delegate_->ScrollUpdate(scroll_delta);
+    if (left_right_delegate_->CanScroll())
       event->SetHandled();
   }
 }
 
 }  // namespace athena