Move bezel event routing for the shelf into ShelfLayoutManager

ash/shelf/shelf_layout_manager.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_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"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell_observer.h"
 #include "ash/system/status_area_widget.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/observer_list.h"
@@ skipping 13 matching lines @@
 class GestureEvent;
 }
 
 namespace ash {
 class ScreenAsh;
 class ShelfLayoutManagerObserver;
 class ShelfWidget;
 namespace internal {
 
 class PanelLayoutManagerTest;
+class ShelfBezelEventFilter;
 class ShelfLayoutManagerTest;
 class StatusAreaWidget;
 class WorkspaceController;
 
 // ShelfLayoutManager is the layout manager responsible for the launcher and
 // status widgets. The launcher is given the total available width and told the
 // width of the status area. This allows the launcher to draw the background and
 // layout to the status area.
 // To respond to bounds changes in the status area StatusAreaLayoutManager works
 // closely with ShelfLayoutManager.
@@ skipping 254 matching lines @@
 
   WorkspaceController* workspace_controller_;
 
   // Do any windows overlap the shelf? This is maintained by WorkspaceManager.
   bool window_overlaps_shelf_;
 
   base::OneShotTimer<ShelfLayoutManager> auto_hide_timer_;
 
   // 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<ShelfBezelEventFilter> bezel_event_filter_;
 
   ObserverList<ShelfLayoutManagerObserver> observers_;
 
   // The shelf reacts to gesture-drags, and can be set to auto-hide for certain
   // gestures. Some shelf behaviour (e.g. visibility state, background color
   // etc.) are affected by various stages of the drag. The enum keeps track of
   // the present status of the gesture drag.
   enum GestureDragStatus {
     GESTURE_DRAG_NONE,
     GESTURE_DRAG_IN_PROGRESS,
@@ skipping 14 matching lines @@
   // The bounds of the keyboard.
   gfx::Rect keyboard_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_