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

Side by Side Diff: chrome/browser/ui/app_list/app_list_syncable_service.h

Issue 597873002: Remove page_ordinal from AppListSpecifics. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | chrome/browser/ui/app_list/app_list_syncable_service.cc » ('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 CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_ 5 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_
6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_ 6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 public content::NotificationObserver { 43 public content::NotificationObserver {
44 public: 44 public:
45 struct SyncItem { 45 struct SyncItem {
46 SyncItem(const std::string& id, 46 SyncItem(const std::string& id,
47 sync_pb::AppListSpecifics::AppListItemType type); 47 sync_pb::AppListSpecifics::AppListItemType type);
48 ~SyncItem(); 48 ~SyncItem();
49 const std::string item_id; 49 const std::string item_id;
50 sync_pb::AppListSpecifics::AppListItemType item_type; 50 sync_pb::AppListSpecifics::AppListItemType item_type;
51 std::string item_name; 51 std::string item_name;
52 std::string parent_id; 52 std::string parent_id;
53 syncer::StringOrdinal page_ordinal;
54 syncer::StringOrdinal item_ordinal; 53 syncer::StringOrdinal item_ordinal;
55 54
56 std::string ToString() const; 55 std::string ToString() const;
57 }; 56 };
58 57
59 // Populates the model when |extension_system| is ready. 58 // Populates the model when |extension_system| is ready.
60 AppListSyncableService(Profile* profile, 59 AppListSyncableService(Profile* profile,
61 extensions::ExtensionSystem* extension_system); 60 extensions::ExtensionSystem* extension_system);
62 61
63 virtual ~AppListSyncableService(); 62 virtual ~AppListSyncableService();
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 207
209 // Provides integration with Drive apps. 208 // Provides integration with Drive apps.
210 scoped_ptr<DriveAppProvider> drive_app_provider_; 209 scoped_ptr<DriveAppProvider> drive_app_provider_;
211 210
212 DISALLOW_COPY_AND_ASSIGN(AppListSyncableService); 211 DISALLOW_COPY_AND_ASSIGN(AppListSyncableService);
213 }; 212 };
214 213
215 } // namespace app_list 214 } // namespace app_list
216 215
217 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_ 216 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/app_list_syncable_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698