Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2787)

Unified Diff: ash/aura/wm_shelf_aura.h

Issue 2109193002: mash: Convert StatusAreaWidgetDelegate to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash.gyp ('k') | ash/aura/wm_shelf_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shelf_aura.h
diff --git a/ash/aura/wm_shelf_aura.h b/ash/aura/wm_shelf_aura.h
index 34bf08fd9980693751ee006111cb2f180f74ad43..148828779da5a64640c5860f4301d3609ccfe982 100644
--- a/ash/aura/wm_shelf_aura.h
+++ b/ash/aura/wm_shelf_aura.h
@@ -9,6 +9,7 @@
#include "ash/common/shelf/wm_shelf.h"
#include "ash/shelf/shelf_icon_observer.h"
#include "ash/shelf/shelf_layout_manager_observer.h"
+#include "ash/wm/gestures/shelf_gesture_handler.h"
#include "base/macros.h"
#include "base/observer_list.h"
@@ -54,6 +55,8 @@ class ASH_EXPORT WmShelfAura : public WmShelf,
gfx::Rect GetUserWorkAreaBounds() const override;
void UpdateIconPositionForWindow(WmWindow* window) override;
gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;
+ bool ProcessGestureEvent(const ui::GestureEvent& event,
+ WmWindow* target_window) override;
void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override;
void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override;
void AddObserver(WmShelfObserver* observer) override;
@@ -76,6 +79,9 @@ class ASH_EXPORT WmShelfAura : public WmShelf,
// Cached separately because it may be destroyed before |shelf_|.
ShelfLayoutManager* shelf_layout_manager_ = nullptr;
+ // Handler for swipe and drag gestures.
+ ShelfGestureHandler gesture_handler_;
+
base::ObserverList<WmShelfObserver> observers_;
DISALLOW_COPY_AND_ASSIGN(WmShelfAura);
« no previous file with comments | « ash/ash.gyp ('k') | ash/aura/wm_shelf_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698