Touch gestures for System Tray/ IME/ Stylus/ Notifications

ash/system/tray/system_tray.h

 // Copyright (c) 2012 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 ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 
 #include <map>
 #include <memory>
 #include <vector>
@@ skipping 29 matching lines @@
 
 // There are different methods for creating bubble views.
 enum BubbleCreationType {
   BUBBLE_CREATE_NEW,    // Closes any existing bubble and creates a new one.
   BUBBLE_USE_EXISTING,  // Uses any existing bubble, or creates a new one.
 };
 
 class ASH_EXPORT SystemTray : public TrayBackgroundView,
                               public views::TrayBubbleView::Delegate {
  public:
-  // The threshold of the velocity of the fling event.
-  static constexpr float kFlingVelocity = 100.0f;
 
   explicit SystemTray(Shelf* shelf);
   ~SystemTray() override;
 
   TrayUpdate* tray_update() { return tray_update_; }
 
   TrayNightLight* tray_night_light() { return tray_night_light_; }
 
   // Calls TrayBackgroundView::Initialize(), creates the tray items, and
   // adds them to SystemTrayNotifier.
@@ skipping 46 matching lines @@
   // Returns true if the system_bubble_ exists and is of type |type|.
   bool HasSystemBubbleType(SystemTrayBubble::BubbleType type);
 
   // Returns a pointer to the system bubble or NULL if none.
   SystemTrayBubble* GetSystemBubble();
 
   // Returns true if system bubble is visible.
   bool IsSystemBubbleVisible() const;
 
   // Closes system bubble and returns true if it did exist.
   bool CloseSystemBubble() const;

[msw, 2017/07/12 05:04:51]

Remove this function, as it's now redundant with CloseBubble().
The only callers checking the bool return value are in unit tests, and they can
instead check HasSystemBubble() before calling CloseBubble(). It may be okay to
delay this cleanup for a followup CL, if you add a TODO and file a bug now, and
follow up soon.

[minch1, 2017/07/13 19:10:35]

Added TODO, will do it in another CL soon.http://crbug.com/741953

[msw, 2017/07/14 02:00:45]

Acknowledged, thanks in advance.

 
   // Returns view for help button if default view is shown. Returns NULL
   // otherwise.
   views::View* GetHelpButtonView() const;
 
   // Returns TrayAudio object if present or null otherwise.
   TrayAudio* GetTrayAudio() const;
 
   // Overridden from 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;
+  bool HasBubble() override;
+  void CloseBubble() override;
+  void ShowBubble() override;
+  views::TrayBubbleView* GetBubbleView() override;
 
   // views::TrayBubbleView::Delegate:
   void BubbleViewDestroyed() override;
   void OnMouseEnteredView() override;
   void OnMouseExitedView() override;
   void RegisterAccelerators(const std::vector<ui::Accelerator>& accelerators,
                             views::TrayBubbleView* tray_bubble_view) override;
   void UnregisterAllAccelerators(
       views::TrayBubbleView* tray_bubble_view) override;
   base::string16 GetAccessibleNameForBubble() override;
   bool ShouldEnableExtraKeyboardAccessibility() override;
   void HideBubble(const views::TrayBubbleView* bubble_view) override;
+  bool ProcessGestureEventForBubble(ui::GestureEvent* event) override;
+
+  // ui::EventHandler:
+  void OnGestureEvent(ui::GestureEvent* event) override;
 
   ScreenTrayItem* GetScreenShareItem() { return screen_share_tray_item_; }
   ScreenTrayItem* GetScreenCaptureItem() { return screen_capture_tray_item_; }
 
   // 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;
 
   // Closes the bubble. Used to bind as a KeyEventWatcher::KeyEventCallback.
   void CloseBubble(const ui::KeyEvent& key_event);
 
   // Activates the bubble and starts key navigation with the |key_event|.
   void ActivateAndStartNavigation(const ui::KeyEvent& key_event);
 
@@ skipping 24 matching lines @@
   // notification tray according to the current status.
   void UpdateWebNotifications();
 
   // Deactivate the system tray in the shelf if it was active before.
   void CloseSystemBubbleAndDeactivateSystemTray();
 
   // Records UMA metrics for the number of user-visible rows in the system menu
   // 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;
 
   // Items.
   std::vector<std::unique_ptr<SystemTrayItem>> items_;
 
   // Pointers to members of |items_|.
   SystemTrayItem* detailed_item_ = nullptr;
 
   // Bubble for default and detailed views.
@@ skipping 28 matching lines @@
   ScreenTrayItem* screen_share_tray_item_ = nullptr;    // not owned
 
   std::unique_ptr<ActivationObserver> activation_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_