diff options
| author | zea <zea@chromium.org> | 2014-09-29 19:41:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 02:41:51 +0000 |
| commit | 34bf875f9792517e620faf70d081be20fc81509b (patch) | |
| tree | 1f6a7706d02ca889fd90bf350238b6871c9df2db /components/sync_driver | |
| parent | 558c328a3f5a49f3e3b1b3e04f71aa3ab78326b3 (diff) | |
| download | chromium_src-34bf875f9792517e620faf70d081be20fc81509b.zip chromium_src-34bf875f9792517e620faf70d081be20fc81509b.tar.gz chromium_src-34bf875f9792517e620faf70d081be20fc81509b.tar.bz2 | |
[Sync] Clean up ProfileSyncService observer events
Several spurious NotifyObserver calls have been removed, in addition to
removing the configuration retry code (which was not doing anything anymore).
BUG=418140
Review URL: https://codereview.chromium.org/612573005
Cr-Commit-Position: refs/heads/master@{#297345}
Diffstat (limited to 'components/sync_driver')
4 files changed, 0 insertions, 10 deletions
diff --git a/components/sync_driver/data_type_manager_impl.cc b/components/sync_driver/data_type_manager_impl.cc index 52b535f..32da8b5 100644 --- a/components/sync_driver/data_type_manager_impl.cc +++ b/components/sync_driver/data_type_manager_impl.cc @@ -341,7 +341,6 @@ void DataTypeManagerImpl::ProcessReconfigure() { void DataTypeManagerImpl::OnDownloadRetry() { DCHECK(state_ == DOWNLOAD_PENDING || state_ == CONFIGURING); - observer_->OnConfigureRetry(); } void DataTypeManagerImpl::DownloadReady( diff --git a/components/sync_driver/data_type_manager_impl_unittest.cc b/components/sync_driver/data_type_manager_impl_unittest.cc index c2e32f7..3aed1f28 100644 --- a/components/sync_driver/data_type_manager_impl_unittest.cc +++ b/components/sync_driver/data_type_manager_impl_unittest.cc @@ -168,10 +168,6 @@ class FakeDataTypeManagerObserver : public DataTypeManagerObserver { done_expectation_ = DataTypeManager::ConfigureResult(); } - virtual void OnConfigureRetry() OVERRIDE{ - // Not verified. - } - virtual void OnConfigureStart() OVERRIDE { EXPECT_TRUE(start_expected_); start_expected_ = false; diff --git a/components/sync_driver/data_type_manager_observer.h b/components/sync_driver/data_type_manager_observer.h index 4e7289d..c5081d5 100644 --- a/components/sync_driver/data_type_manager_observer.h +++ b/components/sync_driver/data_type_manager_observer.h @@ -15,7 +15,6 @@ class DataTypeManagerObserver { public: virtual void OnConfigureDone( const DataTypeManager::ConfigureResult& result) = 0; - virtual void OnConfigureRetry() = 0; virtual void OnConfigureStart() = 0; protected: diff --git a/components/sync_driver/sync_frontend.h b/components/sync_driver/sync_frontend.h index fd40b30..774a553 100644 --- a/components/sync_driver/sync_frontend.h +++ b/components/sync_driver/sync_frontend.h @@ -54,10 +54,6 @@ class SyncFrontend { // The backend queried the server recently and received some updates. virtual void OnSyncCycleCompleted() = 0; - // Configure ran into some kind of error. But it is scheduled to be - // retried. - virtual void OnSyncConfigureRetry() = 0; - // Informs the frontned of some network event. These notifications are // disabled by default and must be enabled through an explicit request to the // SyncBackendHost. |