Touch gestures for System Tray/ IME/ Stylus/ Notifications

ash/system/tray/system_tray.h

Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index 42a245719b1a0af5e27f3c06a91eaef6751e611e..ab5ff6bba0cd9ee30e22281ad9e9f1b4f3883516 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -44,11 +44,8 @@ enum BubbleCreationType {
   BUBBLE_USE_EXISTING,  // Uses any existing bubble, or creates a new one.
 };
 
-class ASH_EXPORT SystemTray : public TrayBackgroundView,
-                              public views::TrayBubbleView::Delegate {
+class ASH_EXPORT SystemTray : public TrayBackgroundView {
  public:
-  // The threshold of the velocity of the fling event.
-  static constexpr float kFlingVelocity = 100.0f;
 
   explicit SystemTray(Shelf* shelf);
   ~SystemTray() override;
@@ -114,6 +111,8 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
   // Returns true if system bubble is visible.
   bool IsSystemBubbleVisible() const;
 
+  // TODO(minch): Remove CloseSystemBubble which is redundant with CloseBubble.
+  // http://crbug.com/741953
   // Closes system bubble and returns true if it did exist.
   bool CloseSystemBubble() const;
 
@@ -124,13 +123,17 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
   // Returns TrayAudio object if present or null otherwise.
   TrayAudio* GetTrayAudio() const;
 
-  // Overridden from TrayBackgroundView.
+  // TrayBackgroundView:
   void UpdateAfterShelfAlignmentChange() override;
   void AnchorUpdated() override;
   base::string16 GetAccessibleNameForTray() override;
   void BubbleResized(const views::TrayBubbleView* bubble_view) override;
   void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
   void ClickedOutsideBubble() override;
+  bool PerformAction(const ui::Event& event) override;
+  void CloseBubble() override;
+  void ShowBubble() override;
+  views::TrayBubbleView* GetBubbleView() override;
 
   // views::TrayBubbleView::Delegate:
   void BubbleViewDestroyed() override;
@@ -150,11 +153,6 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
   // Activates the system tray bubble.
   void ActivateBubble();
 
-  // ui::EventHandler:
-  void OnGestureEvent(ui::GestureEvent* event) override;
-
-  gfx::Rect GetWorkAreaBoundsInScreen() const;
-
  private:
   friend class SystemTrayTestApi;
   class ActivationObserver;
@@ -196,40 +194,6 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
   // and the percentage of the work area height covered by the system menu.
   void RecordSystemMenuMetrics();
 
-  // Overridden from ActionableView.
-  bool PerformAction(const ui::Event& event) override;
-
-  // Gesture related functions:
-  bool ProcessGestureEvent(const ui::GestureEvent& event);
-  bool StartGestureDrag(const ui::GestureEvent& gesture);
-  void UpdateGestureDrag(const ui::GestureEvent& gesture);
-  void CompleteGestureDrag(const ui::GestureEvent& gesture);
-
-  // Update the bounds of the system tray bubble according to |location|. Note
-  // that |location| is in the local coordinate space of |this|.
-  void SetBubbleBounds(const gfx::Point& location);
-
-  // Return true if the system bubble should be shown (i.e., animated upward to
-  // be made fully visible) after a sequence of scroll events terminated by
-  // |sequence_end|. Otherwise return false, indicating that the
-  // partially-visible system bubble should be animated downward and made fully
-  // hidden.
-  bool ShouldShowSystemBubbleAfterScrollSequence(
-      const ui::GestureEvent& sequence_end);
-
-  // Shelf the system tray is in.
-  Shelf* const shelf_;
-
-  // The original bounds of the system tray bubble.
-  gfx::Rect system_tray_bubble_bounds_;
-
-  // Tracks the amount of the drag. Only valid if |is_in_drag_| is true.
-  float gesture_drag_amount_ = 0.f;
-
-  // True if the user is in the process of gesture-dragging to open the system
-  // tray bubble, false otherwise.
-  bool is_in_drag_ = false;
-
   // The web notification tray view that appears adjacent to this view.
   WebNotificationTray* web_notification_tray_ = nullptr;