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

Unified Diff: ash/shelf/shelf_bezel_event_filter.h

Issue 2224653002: mash: Remove ash::ShelfGestureHandler and ui::ET_GESTURE_WIN8_EDGE_SWIPE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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/mus/bridge/wm_shelf_mus.cc ('k') | ash/shelf/shelf_bezel_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_bezel_event_filter.h
diff --git a/ash/shelf/shelf_bezel_event_filter.h b/ash/shelf/shelf_bezel_event_filter.h
index f2edffbeb997a5702e3c7ba83ff8b9fc3ffa4af2..ff7d14d034512bf54b17b35569edaff4c529507f 100644
--- a/ash/shelf/shelf_bezel_event_filter.h
+++ b/ash/shelf/shelf_bezel_event_filter.h
@@ -5,10 +5,13 @@
#ifndef ASH_SHELF_SHELF_BEZEL_EVENT_FILTER_H_
#define ASH_SHELF_SHELF_BEZEL_EVENT_FILTER_H_
-#include "ash/wm/gestures/shelf_gesture_handler.h"
#include "base/macros.h"
#include "ui/events/event_handler.h"
-#include "ui/gfx/geometry/rect.h"
+
+namespace gfx {
+class Point;
+class Rect;
+}
namespace ash {
class ShelfLayoutManager;
@@ -17,7 +20,7 @@ class ShelfLayoutManager;
// shelf.
class ShelfBezelEventFilter : public ui::EventHandler {
public:
- explicit ShelfBezelEventFilter(ShelfLayoutManager* shelf);
+ explicit ShelfBezelEventFilter(ShelfLayoutManager* shelf_layout_manager);
~ShelfBezelEventFilter() override;
// Overridden from ui::EventHandler:
@@ -26,9 +29,9 @@ class ShelfBezelEventFilter : public ui::EventHandler {
private:
bool IsShelfOnBezel(const gfx::Rect& screen, const gfx::Point& point) const;
- ShelfLayoutManager* shelf_; // non-owned
+ ShelfLayoutManager* shelf_layout_manager_;
bool in_touch_drag_;
- ShelfGestureHandler gesture_handler_;
+
DISALLOW_COPY_AND_ASSIGN(ShelfBezelEventFilter);
};
« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/shelf/shelf_bezel_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698