| OLD | NEW |
| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 | 77 |
| 78 // Sets the name of the folder for OEM apps. | 78 // Sets the name of the folder for OEM apps. |
| 79 void SetOemFolderName(const std::string& name); | 79 void SetOemFolderName(const std::string& name); |
| 80 | 80 |
| 81 Profile* profile() { return profile_; } | 81 Profile* profile() { return profile_; } |
| 82 AppListModel* model() { return model_.get(); } | 82 AppListModel* model() { return model_.get(); } |
| 83 size_t GetNumSyncItemsForTest() const { return sync_items_.size(); } | 83 size_t GetNumSyncItemsForTest() const { return sync_items_.size(); } |
| 84 const std::string& GetOemFolderNameForTest() const { | 84 const std::string& GetOemFolderNameForTest() const { |
| 85 return oem_folder_name_; | 85 return oem_folder_name_; |
| 86 } | 86 } |
| 87 void ResetDriveAppProviderForTest(); |
| 87 | 88 |
| 88 // syncer::SyncableService | 89 // syncer::SyncableService |
| 89 virtual syncer::SyncMergeResult MergeDataAndStartSyncing( | 90 virtual syncer::SyncMergeResult MergeDataAndStartSyncing( |
| 90 syncer::ModelType type, | 91 syncer::ModelType type, |
| 91 const syncer::SyncDataList& initial_sync_data, | 92 const syncer::SyncDataList& initial_sync_data, |
| 92 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, | 93 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, |
| 93 scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE; | 94 scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE; |
| 94 virtual void StopSyncing(syncer::ModelType type) OVERRIDE; | 95 virtual void StopSyncing(syncer::ModelType type) OVERRIDE; |
| 95 virtual syncer::SyncDataList GetAllSyncData( | 96 virtual syncer::SyncDataList GetAllSyncData( |
| 96 syncer::ModelType type) const OVERRIDE; | 97 syncer::ModelType type) const OVERRIDE; |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 | 207 |
| 207 // Provides integration with Drive apps. | 208 // Provides integration with Drive apps. |
| 208 scoped_ptr<DriveAppProvider> drive_app_provider_; | 209 scoped_ptr<DriveAppProvider> drive_app_provider_; |
| 209 | 210 |
| 210 DISALLOW_COPY_AND_ASSIGN(AppListSyncableService); | 211 DISALLOW_COPY_AND_ASSIGN(AppListSyncableService); |
| 211 }; | 212 }; |
| 212 | 213 |
| 213 } // namespace app_list | 214 } // namespace app_list |
| 214 | 215 |
| 215 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_ | 216 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_ |
| OLD | NEW |