diff options
| author | brettw <brettw@chromium.org> | 2015-06-03 09:31:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-03 16:32:08 +0000 |
| commit | 236d317f450601fbb56756b0b5ca802659a045f6 (patch) | |
| tree | 086f7f2ed78889e4dc2c17f209871ba364bc9c01 /ash/shelf | |
| parent | e7938cf52a9aeb936c1cb005faaafb9f2b16cd4f (diff) | |
| download | chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.zip chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.gz chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.bz2 | |
Replace more ObserverList with base::ObserverList.
This is everything but the chrome directory
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=zelidrag@chromium.org (chromeos)
TBR=keybuk@chromium.org (device/bluetooth)
Review URL: https://codereview.chromium.org/1162943002
Cr-Commit-Position: refs/heads/master@{#332626}
Diffstat (limited to 'ash/shelf')
| -rw-r--r-- | ash/shelf/shelf_button.cc | 2 | ||||
| -rw-r--r-- | ash/shelf/shelf_item_delegate_manager.h | 2 | ||||
| -rw-r--r-- | ash/shelf/shelf_layout_manager.h | 2 | ||||
| -rw-r--r-- | ash/shelf/shelf_model.h | 2 | ||||
| -rw-r--r-- | ash/shelf/shelf_view.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc index 388bf48..a6dc835 100644 --- a/ash/shelf/shelf_button.cc +++ b/ash/shelf/shelf_button.cc @@ -98,7 +98,7 @@ class ShelfButtonAnimation : public gfx::AnimationDelegate { } gfx::ThrobAnimation animation_; - ObserverList<Observer> observers_; + base::ObserverList<Observer> observers_; DISALLOW_COPY_AND_ASSIGN(ShelfButtonAnimation); }; diff --git a/ash/shelf/shelf_item_delegate_manager.h b/ash/shelf/shelf_item_delegate_manager.h index d2e77b9..b19b3a5 100644 --- a/ash/shelf/shelf_item_delegate_manager.h +++ b/ash/shelf/shelf_item_delegate_manager.h @@ -75,7 +75,7 @@ class ASH_EXPORT ShelfItemDelegateManager : public ShelfModelObserver { ShelfIDToItemDelegateMap id_to_item_delegate_map_; - ObserverList<ShelfItemDelegateManagerObserver> observers_; + base::ObserverList<ShelfItemDelegateManagerObserver> observers_; DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateManager); }; diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h index 96f405e..240e765 100644 --- a/ash/shelf/shelf_layout_manager.h +++ b/ash/shelf/shelf_layout_manager.h @@ -376,7 +376,7 @@ class ASH_EXPORT ShelfLayoutManager // EventFilter used to detect when user issues a gesture on a bezel sensor. scoped_ptr<ShelfBezelEventFilter> bezel_event_filter_; - ObserverList<ShelfLayoutManagerObserver> observers_; + base::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 diff --git a/ash/shelf/shelf_model.h b/ash/shelf/shelf_model.h index 3b57c2a..8c683c6 100644 --- a/ash/shelf/shelf_model.h +++ b/ash/shelf/shelf_model.h @@ -91,7 +91,7 @@ class ASH_EXPORT ShelfModel { ShelfItems items_; Status status_; - ObserverList<ShelfModelObserver> observers_; + base::ObserverList<ShelfModelObserver> observers_; DISALLOW_COPY_AND_ASSIGN(ShelfModel); }; diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h index 2bfb4fa..82ea7fa 100644 --- a/ash/shelf/shelf_view.h +++ b/ash/shelf/shelf_view.h @@ -372,7 +372,7 @@ class ASH_EXPORT ShelfView : public views::View, scoped_ptr<views::MenuRunner> launcher_menu_runner_; - ObserverList<ShelfIconObserver> observers_; + base::ObserverList<ShelfIconObserver> observers_; // Amount content is inset on the left edge (or top edge for vertical // alignment). |