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

Unified Diff: chrome/browser/sync/profile_sync_service.cc

Issue 10584019: sync: Remove ClearUserData command. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index b523fc3979f779020992820feb9aca86b5229fba..2154e95937d1b42002c499884c00714015c0b180 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -128,7 +128,6 @@ ProfileSyncService::ProfileSyncService(ProfileSyncComponentsFactory* factory,
unrecoverable_error_reason_(ERROR_REASON_UNSET),
weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
expect_sync_configuration_aborted_(false),
- clear_server_data_state_(CLEAR_NOT_STARTED),
encrypted_types_(browser_sync::Cryptographer::SensitiveTypes()),
encrypt_everything_(false),
encryption_pending_(false),
@@ -271,15 +270,6 @@ browser_sync::SessionModelAssociator*
syncable::SESSIONS)->second.get())->GetModelAssociator();
}
-void ProfileSyncService::ResetClearServerDataState() {
- clear_server_data_state_ = CLEAR_NOT_STARTED;
-}
-
-ProfileSyncService::ClearServerDataState
- ProfileSyncService::GetClearServerDataState() {
- return clear_server_data_state_;
-}
-
void ProfileSyncService::GetDataTypeControllerStates(
browser_sync::DataTypeController::StateMap* state_map) const {
for (browser_sync::DataTypeController::TypeMap::const_iterator iter =
@@ -520,14 +510,6 @@ void ProfileSyncService::ShutdownImpl(bool sync_disabled) {
}
}
-void ProfileSyncService::ClearServerData() {
- clear_server_data_state_ = CLEAR_CLEARING;
- clear_server_data_timer_.Start(FROM_HERE,
- base::TimeDelta::FromSeconds(kSyncClearDataTimeoutInSeconds), this,
- &ProfileSyncService::OnClearServerDataTimeout);
- backend_->RequestClearServerData();
-}
-
void ProfileSyncService::DisableForUser() {
// Clear prefs (including SyncSetupHasCompleted) before shutting down so
// PSS clients don't think we're set up while we're shutting down.
@@ -840,38 +822,6 @@ void ProfileSyncService::OnStopSyncingPermanently() {
DisableForUser();
}
-void ProfileSyncService::OnClearServerDataTimeout() {
- if (clear_server_data_state_ != CLEAR_SUCCEEDED &&
- clear_server_data_state_ != CLEAR_FAILED) {
- clear_server_data_state_ = CLEAR_FAILED;
- NotifyObservers();
- }
-}
-
-void ProfileSyncService::OnClearServerDataFailed() {
- clear_server_data_timer_.Stop();
-
- // Only once clear has succeeded there is no longer a need to transition to
- // a failed state as sync is disabled locally. Also, no need to fire off
- // the observers if the state didn't change (i.e. it was FAILED before).
- if (clear_server_data_state_ != CLEAR_SUCCEEDED &&
- clear_server_data_state_ != CLEAR_FAILED) {
- clear_server_data_state_ = CLEAR_FAILED;
- NotifyObservers();
- }
-}
-
-void ProfileSyncService::OnClearServerDataSucceeded() {
- clear_server_data_timer_.Stop();
-
- // Even if the timout fired, we still transition to the succeeded state as
- // we want UI to update itself and no longer allow the user to press "clear"
- if (clear_server_data_state_ != CLEAR_SUCCEEDED) {
- clear_server_data_state_ = CLEAR_SUCCEEDED;
- NotifyObservers();
- }
-}
-
void ProfileSyncService::OnPassphraseRequired(
sync_api::PassphraseRequiredReason reason,
const sync_pb::EncryptedData& pending_keys) {
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/sync/profile_sync_service_startup_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698