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

Side by Side Diff: ui/app_list/app_list_item_list.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 | « ui/app_list/app_list_item.h ('k') | ui/app_list/app_list_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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 UI_APP_LIST_APP_LIST_ITEM_LIST_H_ 5 #ifndef UI_APP_LIST_APP_LIST_ITEM_LIST_H_
6 #define UI_APP_LIST_APP_LIST_ITEM_LIST_H_ 6 #define UI_APP_LIST_APP_LIST_ITEM_LIST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // Returns the index at which to insert an item in |app_list_items_| based on 99 // Returns the index at which to insert an item in |app_list_items_| based on
100 // |position| (which must be valid) and |id| (if the positions are equal). 100 // |position| (which must be valid) and |id| (if the positions are equal).
101 size_t GetItemSortOrderIndex(const syncer::StringOrdinal& position, 101 size_t GetItemSortOrderIndex(const syncer::StringOrdinal& position,
102 const std::string& id); 102 const std::string& id);
103 103
104 // Fixes the position of the item at |index| when the position matches the 104 // Fixes the position of the item at |index| when the position matches the
105 // previous item's position. |index| must be > 0. 105 // previous item's position. |index| must be > 0.
106 void FixItemPosition(size_t index); 106 void FixItemPosition(size_t index);
107 107
108 ScopedVector<AppListItem> app_list_items_; 108 ScopedVector<AppListItem> app_list_items_;
109 ObserverList<AppListItemListObserver, true> observers_; 109 base::ObserverList<AppListItemListObserver, true> observers_;
110 std::string highlighted_id_; 110 std::string highlighted_id_;
111 111
112 DISALLOW_COPY_AND_ASSIGN(AppListItemList); 112 DISALLOW_COPY_AND_ASSIGN(AppListItemList);
113 }; 113 };
114 114
115 } // namespace app_list 115 } // namespace app_list
116 116
117 #endif // UI_APP_LIST_APP_LIST_ITEM_LIST_H_ 117 #endif // UI_APP_LIST_APP_LIST_ITEM_LIST_H_
OLDNEW
« no previous file with comments | « ui/app_list/app_list_item.h ('k') | ui/app_list/app_list_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698