diff options
| author | maxbogue <maxbogue@chromium.org> | 2015-10-26 15:45:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-26 22:46:31 +0000 |
| commit | aff7d9d8b12a05fd87eaaef0c3206342ecdd82c8 (patch) | |
| tree | f0fa2eba05a76aba7b4e600d63939bd8598a8035 /components/sync_driver | |
| parent | 2f9d0e8e86070fb899feaaf6fba8d3c7dcf8c297 (diff) | |
| download | chromium_src-aff7d9d8b12a05fd87eaaef0c3206342ecdd82c8.zip chromium_src-aff7d9d8b12a05fd87eaaef0c3206342ecdd82c8.tar.gz chromium_src-aff7d9d8b12a05fd87eaaef0c3206342ecdd82c8.tar.bz2 | |
[Sync] Remove ExtensionsActivityMonitor from SyncBackendHostImpl.
It is now owned by ChromeSyncClient, with an accessor for
ExtensionsActivity being added to SyncClient.
BUG=512029
Review URL: https://codereview.chromium.org/1419233003
Cr-Commit-Position: refs/heads/master@{#356156}
Diffstat (limited to 'components/sync_driver')
| -rw-r--r-- | components/sync_driver/fake_sync_client.cc | 6 | ||||
| -rw-r--r-- | components/sync_driver/fake_sync_client.h | 1 | ||||
| -rw-r--r-- | components/sync_driver/sync_client.h | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/components/sync_driver/fake_sync_client.cc b/components/sync_driver/fake_sync_client.cc index d744955..9ee5f3e 100644 --- a/components/sync_driver/fake_sync_client.cc +++ b/components/sync_driver/fake_sync_client.cc @@ -8,6 +8,7 @@ #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/password_manager/core/browser/password_store.h" #include "components/sync_driver/fake_sync_service.h" +#include "sync/util/extensions_activity.h" namespace sync_driver { @@ -65,6 +66,11 @@ BookmarkUndoService* FakeSyncClient::GetBookmarkUndoServiceIfExists() { return nullptr; } +scoped_refptr<syncer::ExtensionsActivity> +FakeSyncClient::GetExtensionsActivity() { + return scoped_refptr<syncer::ExtensionsActivity>(); +} + base::WeakPtr<syncer::SyncableService> FakeSyncClient::GetSyncableServiceForType(syncer::ModelType type) { return base::WeakPtr<syncer::SyncableService>(); diff --git a/components/sync_driver/fake_sync_client.h b/components/sync_driver/fake_sync_client.h index 0944d74..a0f0d0d 100644 --- a/components/sync_driver/fake_sync_client.h +++ b/components/sync_driver/fake_sync_client.h @@ -29,6 +29,7 @@ class FakeSyncClient : public SyncClient { autofill::PersonalDataManager* GetPersonalDataManager() override; scoped_refptr<autofill::AutofillWebDataService> GetWebDataService() override; BookmarkUndoService* GetBookmarkUndoServiceIfExists() override; + scoped_refptr<syncer::ExtensionsActivity> GetExtensionsActivity() override; base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType( syncer::ModelType type) override; scoped_refptr<syncer::ModelSafeWorker> CreateModelWorkerForGroup( diff --git a/components/sync_driver/sync_client.h b/components/sync_driver/sync_client.h index 59aeba4..5039456 100644 --- a/components/sync_driver/sync_client.h +++ b/components/sync_driver/sync_client.h @@ -11,6 +11,7 @@ #include "base/memory/weak_ptr.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/engine/model_safe_worker.h" +#include "sync/util/extensions_activity.h" class BookmarkUndoService; class PrefService; @@ -82,6 +83,7 @@ class SyncClient { virtual scoped_refptr<autofill::AutofillWebDataService> GetWebDataService() = 0; virtual BookmarkUndoService* GetBookmarkUndoServiceIfExists() = 0; + virtual scoped_refptr<syncer::ExtensionsActivity> GetExtensionsActivity() = 0; // Returns a weak pointer to the syncable service specified by |type|. // Weak pointer may be unset if service is already destroyed. |