Tablet WM : Swiping on system tray bubble.

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>
 
 #include "ash/ash_export.h"
+#include "ash/shell_observer.h"
 #include "ash/system/tray/system_tray_bubble.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "base/macros.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 class KeyEventWatcher;
 enum class LoginStatus;
 class ScreenTrayItem;
 class SystemBubbleWrapper;
 class SystemTrayDelegate;
 class SystemTrayItem;
 class TrayAccessibility;
 class TrayAudio;
 class TrayCast;
 class TrayEnterprise;
 class TrayNetwork;
 class TrayNightLight;
 class TrayScale;
 class TraySessionLengthLimit;
 class TraySupervisedUser;
 class TraySystemInfo;
 class TrayTiles;
 class TrayUpdate;
 class WebNotificationTray;
 
+namespace test {
+class SystemTrayTest;
+}
+
 // 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 views::TrayBubbleView::Delegate,
+                              public ShellObserver {
  public:
   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 70 matching lines @@
   void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
   void ClickedOutsideBubble() override;
 
   // views::TrayBubbleView::Delegate:
   void BubbleViewDestroyed() override;
   void OnMouseEnteredView() override;
   void OnMouseExitedView() override;
   base::string16 GetAccessibleNameForBubble() override;
   void HideBubble(const views::TrayBubbleView* bubble_view) override;
 
+  // ShellObserver:
+  void OnMaximizeModeStarted() override;
+  void OnMaximizeModeEnded() override;
+
   ScreenTrayItem* GetScreenShareItem() { return screen_share_tray_item_; }
   ScreenTrayItem* GetScreenCaptureItem() { return screen_capture_tray_item_; }
 
   // Activates the system tray bubble.
   void ActivateBubble();
 
+  gfx::Rect GetWorkAreaBoundsInScreen() const;
+
+  bool in_maximize_mode() { return in_maximize_mode_; }
+
  private:
   friend class SystemTrayTestApi;
+  friend class test::SystemTrayTest;

[xiyuan, 2017/06/16 17:33:42]

Can you extend SystemTrayTestApi to allow setting |in_maximize_mode_| instead of
adding new friends?

[minch1, 2017/06/16 22:11:51]

Done.

   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);
 
   // Creates the key event watcher. See |ShowItems()| for why key events are
   // observed.
@@ skipping 29 matching lines @@
   // 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;
 
+  // Overridden from ui::EventHandler:
+  void OnGestureEvent(ui::GestureEvent* 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);
+
+  // Returns true if swiping down triggered on the system tray area on the
+  // shelf.
+  bool IsSwipingDownOnShelf(const ui::GestureEvent& gesture);
+
+  // Update the bounds of the system tray bubble according to the location of
+  // the gesture.
+  void UpdateBoundsOnGesture(const ui::GestureEvent& gesture);
+
+  // Rules for showing / closing the system bubble for swiping.
+  // |ET_GESTURE_SCROLL_END| considers only the position of the dragging.
+  // |ET_SCROLL_FLING_START| should consider both position and velocity of the
+  // dragging.

[xiyuan, 2017/06/16 17:33:42]

This comment seems to be just for ShouldShowSystemBubbleForSwiping. Move it
there and document ShouldShowSystemBubbleBasedOnPosition properly.

[minch1, 2017/06/16 22:11:51]

Done.

+  bool ShouldShowSystemBubbleBasedOnPosition();

[xiyuan, 2017/06/16 17:33:42]

nit: ShouldShowSystemBubbleBasedOnPosition ->
ShouldShowSystemBubbleBasedOnDragAmount

[minch1, 2017/06/16 22:11:51]

Done.

+  bool ShouldShowSystemBubbleForSwiping(const ui::GestureEvent& gesture);
+
+  // Shelf the system tray is in.
+  Shelf* const shelf_;
+
+  // Swiping of the system tray bubble is only for maximize mode.
+  bool in_maximize_mode_ = false;
+
+  // The original bounds of the system tray bubble.
+  gfx::Rect system_tray_bubble_bounds_ = gfx::Rect();
+
+  // Tracks the amount of the drag.
+  float gesture_drag_amount_ = 0.f;
+
   // 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 29 matching lines @@
   std::unique_ptr<KeyEventWatcher> key_event_watcher_;
 
   std::unique_ptr<ActivationObserver> activation_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_