Split Screen mode implementation

athena/wm/bezel_controller.h

Index: athena/wm/bezel_controller.h
diff --git a/athena/wm/bezel_controller.h b/athena/wm/bezel_controller.h
index 30fe974f6cbb7d3fddf57bab02532d6684d739b4..66f16b23805d74e37356f1311e1a5ff7c7d0ec16 100644
--- a/athena/wm/bezel_controller.h
+++ b/athena/wm/bezel_controller.h
@@ -67,11 +67,14 @@ class BezelController : public ui::EventHandler {
     BEZEL_SCROLLING_TWO_FINGERS,
   };
 
-  // Calculates the distance from |position| to the |bezel|.
-  float GetDistance(const gfx::PointF& position, Bezel bezel);
-
-  // |scroll_position| only needs to be passed in the scrolling state
-  void SetState(State state, const gfx::PointF& scroll_position);
+  // Calculates the distance from |location| specified in |window|'s coordinates
+  // to the |bezel|.
+  float GetDistance(const gfx::PointF& location,
+                    aura::Window* window,
+                    Bezel bezel);
+
+  // |scroll_delta| only needs to be passed in the scrolling state
+  void SetState(State state, float scroll_delta);
 
   // Returns the bezel corresponding to the |location| or BEZEL_NONE if the
   // location is outside of the bezel area.