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

Side by Side Diff: ash/shelf/shelf_view.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_model.h ('k') | ash/shell.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_VIEW_H_ 5 #ifndef ASH_SHELF_SHELF_VIEW_H_
6 #define ASH_SHELF_SHELF_VIEW_H_ 6 #define ASH_SHELF_SHELF_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 365
366 // Used for the context menu of a particular item. 366 // Used for the context menu of a particular item.
367 ShelfID context_menu_id_; 367 ShelfID context_menu_id_;
368 368
369 scoped_ptr<views::FocusSearch> focus_search_; 369 scoped_ptr<views::FocusSearch> focus_search_;
370 370
371 scoped_ptr<ui::MenuModel> context_menu_model_; 371 scoped_ptr<ui::MenuModel> context_menu_model_;
372 372
373 scoped_ptr<views::MenuRunner> launcher_menu_runner_; 373 scoped_ptr<views::MenuRunner> launcher_menu_runner_;
374 374
375 ObserverList<ShelfIconObserver> observers_; 375 base::ObserverList<ShelfIconObserver> observers_;
376 376
377 // Amount content is inset on the left edge (or top edge for vertical 377 // Amount content is inset on the left edge (or top edge for vertical
378 // alignment). 378 // alignment).
379 int leading_inset_; 379 int leading_inset_;
380 380
381 ShelfGestureHandler gesture_handler_; 381 ShelfGestureHandler gesture_handler_;
382 382
383 // True when an item being inserted or removed in the model cancels a drag. 383 // True when an item being inserted or removed in the model cancels a drag.
384 bool cancelling_drag_model_changed_; 384 bool cancelling_drag_model_changed_;
385 385
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 450
451 // Tracks UMA metrics based on shelf button press actions. 451 // Tracks UMA metrics based on shelf button press actions.
452 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 452 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
453 453
454 DISALLOW_COPY_AND_ASSIGN(ShelfView); 454 DISALLOW_COPY_AND_ASSIGN(ShelfView);
455 }; 455 };
456 456
457 } // namespace ash 457 } // namespace ash
458 458
459 #endif // ASH_SHELF_SHELF_VIEW_H_ 459 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_model.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698