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

Side by Side Diff: ash/shelf/shelf_item_delegate_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_button.cc ('k') | ash/shelf/shelf_layout_manager.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_ITEM_DELEGATE_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_
6 #define ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_ 6 #define ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 typedef std::map<ShelfID, ShelfItemDelegate*> ShelfIDToItemDelegateMap; 68 typedef std::map<ShelfID, ShelfItemDelegate*> ShelfIDToItemDelegateMap;
69 69
70 // Remove and destroy ShelfItemDelegate for |id|. 70 // Remove and destroy ShelfItemDelegate for |id|.
71 void RemoveShelfItemDelegate(ShelfID id); 71 void RemoveShelfItemDelegate(ShelfID id);
72 72
73 // Owned by Shell. 73 // Owned by Shell.
74 ShelfModel* model_; 74 ShelfModel* model_;
75 75
76 ShelfIDToItemDelegateMap id_to_item_delegate_map_; 76 ShelfIDToItemDelegateMap id_to_item_delegate_map_;
77 77
78 ObserverList<ShelfItemDelegateManagerObserver> observers_; 78 base::ObserverList<ShelfItemDelegateManagerObserver> observers_;
79 79
80 DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateManager); 80 DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateManager);
81 }; 81 };
82 82
83 } // namespace ash 83 } // namespace ash
84 84
85 #endif // ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_ 85 #endif // ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_button.cc ('k') | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698