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

Side by Side Diff: ui/app_list/app_list_model.h

Issue 683703002: Notify launcher page with onTransitionChanged event (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@launcher_page_api_show_state_notify
Patch Set: nullptr like it's 1999 Created 6 years, 1 month 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
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 25 matching lines...) Expand all
36 public: 36 public:
37 enum Status { 37 enum Status {
38 STATUS_NORMAL, 38 STATUS_NORMAL,
39 STATUS_SYNCING, // Syncing apps or installing synced apps. 39 STATUS_SYNCING, // Syncing apps or installing synced apps.
40 }; 40 };
41 41
42 enum State { 42 enum State {
43 STATE_APPS, 43 STATE_APPS,
44 STATE_SEARCH_RESULTS, 44 STATE_SEARCH_RESULTS,
45 STATE_START, 45 STATE_START,
46 STATE_CUSTOM_LAUNCHER_PAGE,
Matt Giuca 2014/11/03 00:57:42 I think you can move this change, and the changes
calamity 2014/11/06 02:36:32 The var would be unused. Is there a point to this?
46 47
47 INVALID_STATE, 48 INVALID_STATE,
48 }; 49 };
49 50
50 typedef ui::ListModel<SearchResult> SearchResults; 51 typedef ui::ListModel<SearchResult> SearchResults;
51 52
52 AppListModel(); 53 AppListModel();
53 ~AppListModel() override; 54 ~AppListModel() override;
54 55
55 void AddObserver(AppListModelObserver* observer); 56 void AddObserver(AppListModelObserver* observer);
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 State state_; 184 State state_;
184 ObserverList<AppListModelObserver, true> observers_; 185 ObserverList<AppListModelObserver, true> observers_;
185 bool folders_enabled_; 186 bool folders_enabled_;
186 187
187 DISALLOW_COPY_AND_ASSIGN(AppListModel); 188 DISALLOW_COPY_AND_ASSIGN(AppListModel);
188 }; 189 };
189 190
190 } // namespace app_list 191 } // namespace app_list
191 192
192 #endif // UI_APP_LIST_APP_LIST_MODEL_H_ 193 #endif // UI_APP_LIST_APP_LIST_MODEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698