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

Unified Diff: ash/shelf/shelf_layout_manager.h

Issue 15931005: Move bezel event routing for the shelf into ShelfLayoutManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits for sadrul@ Created 7 years, 7 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/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index e2018f8eaa181fd9f452a39f03aa242b07b1bb37..2fa55624b4394e685a0a7b2a301bbfb408c52f5e 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -5,6 +5,8 @@
#ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
#define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
+#include <vector>
+
#include "ash/ash_export.h"
#include "ash/launcher/launcher.h"
#include "ash/shelf/background_animator.h"
@@ -194,6 +196,7 @@ class ASH_EXPORT ShelfLayoutManager :
private:
class AutoHideEventFilter;
+ class BezelEventFilter;
class UpdateShelfObserver;
friend class ash::ScreenAsh;
friend class PanelLayoutManagerTest;
@@ -312,7 +315,10 @@ class ASH_EXPORT ShelfLayoutManager :
// EventFilter used to detect when user moves the mouse over the launcher to
// trigger showing the launcher.
- scoped_ptr<AutoHideEventFilter> event_filter_;
+ scoped_ptr<AutoHideEventFilter> auto_hide_event_filter_;
+
+ // EventFilter used to detect when user issues a gesture on a bezel sensor.
+ scoped_ptr<BezelEventFilter> bezel_event_filter_;
sky 2013/05/31 17:04:50 What's the compelling reason to have this owned by
rharrison 2013/06/05 18:24:04 It ties the filter's lifespan to the shelf, thus t
ObserverList<ShelfLayoutManagerObserver> observers_;
« no previous file with comments | « ash/ash.gyp ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698