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

Side by Side Diff: ash/shelf/shelf_layout_manager.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « ash/shelf/shelf_item_delegate_manager.h ('k') | ash/shelf/shelf_model.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 // False when neither the auto hide timer nor the timer task are running. 369 // False when neither the auto hide timer nor the timer task are running.
370 bool mouse_over_shelf_when_auto_hide_timer_started_; 370 bool mouse_over_shelf_when_auto_hide_timer_started_;
371 371
372 // EventFilter used to detect when user moves the mouse over the shelf to 372 // EventFilter used to detect when user moves the mouse over the shelf to
373 // trigger showing the shelf. 373 // trigger showing the shelf.
374 scoped_ptr<AutoHideEventFilter> auto_hide_event_filter_; 374 scoped_ptr<AutoHideEventFilter> auto_hide_event_filter_;
375 375
376 // EventFilter used to detect when user issues a gesture on a bezel sensor. 376 // EventFilter used to detect when user issues a gesture on a bezel sensor.
377 scoped_ptr<ShelfBezelEventFilter> bezel_event_filter_; 377 scoped_ptr<ShelfBezelEventFilter> bezel_event_filter_;
378 378
379 ObserverList<ShelfLayoutManagerObserver> observers_; 379 base::ObserverList<ShelfLayoutManagerObserver> observers_;
380 380
381 // The shelf reacts to gesture-drags, and can be set to auto-hide for certain 381 // The shelf reacts to gesture-drags, and can be set to auto-hide for certain
382 // gestures. Some shelf behaviour (e.g. visibility state, background color 382 // gestures. Some shelf behaviour (e.g. visibility state, background color
383 // etc.) are affected by various stages of the drag. The enum keeps track of 383 // etc.) are affected by various stages of the drag. The enum keeps track of
384 // the present status of the gesture drag. 384 // the present status of the gesture drag.
385 enum GestureDragStatus { 385 enum GestureDragStatus {
386 GESTURE_DRAG_NONE, 386 GESTURE_DRAG_NONE,
387 GESTURE_DRAG_IN_PROGRESS, 387 GESTURE_DRAG_IN_PROGRESS,
388 GESTURE_DRAG_CANCEL_IN_PROGRESS, 388 GESTURE_DRAG_CANCEL_IN_PROGRESS,
389 GESTURE_DRAG_COMPLETE_IN_PROGRESS 389 GESTURE_DRAG_COMPLETE_IN_PROGRESS
(...skipping 22 matching lines...) Expand all
412 412
413 // The show hide animation duration override or 0 for default. 413 // The show hide animation duration override or 0 for default.
414 int duration_override_in_ms_; 414 int duration_override_in_ms_;
415 415
416 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 416 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
417 }; 417 };
418 418
419 } // namespace ash 419 } // namespace ash
420 420
421 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 421 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_item_delegate_manager.h ('k') | ash/shelf/shelf_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698