Chromium Code Reviews| Index: components/browser_sync/profile_sync_service.h |
| diff --git a/components/browser_sync/profile_sync_service.h b/components/browser_sync/profile_sync_service.h |
| index 875de4a21789d97b30e5246dde6a45d83737af73..db71517d43576ae8a03b9c06b26ef807c7d3d727 100644 |
| --- a/components/browser_sync/profile_sync_service.h |
| +++ b/components/browser_sync/profile_sync_service.h |
| @@ -321,7 +321,7 @@ class ProfileSyncService : public sync_driver::SyncService, |
| base::string16 GetLastSyncedTimeString() const override; |
| std::string GetBackendInitializationStateString() const override; |
| syncer::SyncCycleSnapshot GetLastCycleSnapshot() const override; |
| - base::Value* GetTypeStatusMap() const override; |
|
Gang Wu
2016/09/28 00:54:59
remove this is because ProfileSyncService::OnDirec
pavely
2016/09/30 00:01:51
Acknowledged.
|
| + base::Value* GetTypeStatusMap() override; |
| const GURL& sync_service_url() const override; |
| std::string unrecoverable_error_message() const override; |
| tracked_objects::Location unrecoverable_error_location() const override; |
| @@ -384,9 +384,9 @@ class ProfileSyncService : public sync_driver::SyncService, |
| void OnDirectoryTypeUpdateCounterUpdated( |
| syncer::ModelType type, |
| const syncer::UpdateCounters& counters) override; |
| - void OnDirectoryTypeStatusCounterUpdated( |
| + void OnDatatypeStatusCounterUpdated( |
| syncer::ModelType type, |
| - const syncer::StatusCounters& counters) override; |
| + std::unique_ptr<syncer::StatusCounters> counters) override; |
| void OnConnectionStatusChange(syncer::ConnectionStatus status) override; |
| void OnPassphraseRequired( |
| syncer::PassphraseRequiredReason reason, |