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

Side by Side Diff: ui/app_list/app_list_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 | « ui/app_list/app_list_item_list.h ('k') | ui/app_list/folder_image.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 UI_APP_LIST_APP_LIST_MODEL_H_ 5 #ifndef UI_APP_LIST_APP_LIST_MODEL_H_
6 #define UI_APP_LIST_APP_LIST_MODEL_H_ 6 #define UI_APP_LIST_APP_LIST_MODEL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 scoped_ptr<AppListItem> RemoveItemFromFolder(AppListFolderItem* folder, 213 scoped_ptr<AppListItem> RemoveItemFromFolder(AppListFolderItem* folder,
214 AppListItem* item); 214 AppListItem* item);
215 215
216 scoped_ptr<AppListItemList> top_level_item_list_; 216 scoped_ptr<AppListItemList> top_level_item_list_;
217 217
218 scoped_ptr<SearchBoxModel> search_box_; 218 scoped_ptr<SearchBoxModel> search_box_;
219 scoped_ptr<SearchResults> results_; 219 scoped_ptr<SearchResults> results_;
220 220
221 Status status_; 221 Status status_;
222 State state_; 222 State state_;
223 ObserverList<AppListModelObserver, true> observers_; 223 base::ObserverList<AppListModelObserver, true> observers_;
224 bool folders_enabled_; 224 bool folders_enabled_;
225 bool custom_launcher_page_enabled_; 225 bool custom_launcher_page_enabled_;
226 std::string custom_launcher_page_name_; 226 std::string custom_launcher_page_name_;
227 bool search_engine_is_google_; 227 bool search_engine_is_google_;
228 228
229 // The current number of subpages the custom launcher page has pushed. 229 // The current number of subpages the custom launcher page has pushed.
230 int custom_launcher_page_subpage_depth_; 230 int custom_launcher_page_subpage_depth_;
231 231
232 DISALLOW_COPY_AND_ASSIGN(AppListModel); 232 DISALLOW_COPY_AND_ASSIGN(AppListModel);
233 }; 233 };
234 234
235 } // namespace app_list 235 } // namespace app_list
236 236
237 #endif // UI_APP_LIST_APP_LIST_MODEL_H_ 237 #endif // UI_APP_LIST_APP_LIST_MODEL_H_
OLDNEW
« no previous file with comments | « ui/app_list/app_list_item_list.h ('k') | ui/app_list/folder_image.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698