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

Side by Side Diff: ash/shelf/shelf_model.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_layout_manager.h ('k') | ash/shelf/shelf_view.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_MODEL_H_ 5 #ifndef ASH_SHELF_SHELF_MODEL_H_
6 #define ASH_SHELF_SHELF_MODEL_H_ 6 #define ASH_SHELF_SHELF_MODEL_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shelf/shelf_item_types.h" 9 #include "ash/shelf/shelf_item_types.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // Makes sure |index| is in line with the type-based order of items. If that 84 // Makes sure |index| is in line with the type-based order of items. If that
85 // is not the case, adjusts index by shifting it to the valid range and 85 // is not the case, adjusts index by shifting it to the valid range and
86 // returns the new value. 86 // returns the new value.
87 int ValidateInsertionIndex(ShelfItemType type, int index) const; 87 int ValidateInsertionIndex(ShelfItemType type, int index) const;
88 88
89 // ID assigned to the next item. 89 // ID assigned to the next item.
90 ShelfID next_id_; 90 ShelfID next_id_;
91 91
92 ShelfItems items_; 92 ShelfItems items_;
93 Status status_; 93 Status status_;
94 ObserverList<ShelfModelObserver> observers_; 94 base::ObserverList<ShelfModelObserver> observers_;
95 95
96 DISALLOW_COPY_AND_ASSIGN(ShelfModel); 96 DISALLOW_COPY_AND_ASSIGN(ShelfModel);
97 }; 97 };
98 98
99 } // namespace ash 99 } // namespace ash
100 100
101 #endif // ASH_SHELF_SHELF_MODEL_H_ 101 #endif // ASH_SHELF_SHELF_MODEL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager.h ('k') | ash/shelf/shelf_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698