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

Side by Side Diff: ios/chrome/browser/sync/sync_setup_service.cc

Issue 2790483002: Fixes History page keeps on loading when signed in with Passphrase (Closed)
Patch Set: a Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #include "ios/chrome/browser/sync/sync_setup_service.h" 5 #include "ios/chrome/browser/sync/sync_setup_service.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "components/prefs/pref_service.h" 10 #include "components/prefs/pref_service.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 if (sync_all && !IsSyncEnabled()) 101 if (sync_all && !IsSyncEnabled())
102 SetSyncEnabled(true); 102 SetSyncEnabled(true);
103 sync_service_->OnUserChoseDatatypes( 103 sync_service_->OnUserChoseDatatypes(
104 sync_all, Intersection(GetDataTypes(), syncer::UserSelectableTypes())); 104 sync_all, Intersection(GetDataTypes(), syncer::UserSelectableTypes()));
105 } 105 }
106 106
107 bool SyncSetupService::IsSyncEnabled() const { 107 bool SyncSetupService::IsSyncEnabled() const {
108 return sync_service_->CanSyncStart(); 108 return sync_service_->CanSyncStart();
109 } 109 }
110 110
111 bool SyncSetupService::IsSecondaryPassphraseEnabled() const {
112 return sync_service_->IsUsingSecondaryPassphrase();
113 }
114
111 void SyncSetupService::SetSyncEnabled(bool sync_enabled) { 115 void SyncSetupService::SetSyncEnabled(bool sync_enabled) {
112 SetSyncEnabledWithoutChangingDatatypes(sync_enabled); 116 SetSyncEnabledWithoutChangingDatatypes(sync_enabled);
113 if (sync_enabled && GetDataTypes().Empty()) 117 if (sync_enabled && GetDataTypes().Empty())
114 SetSyncingAllDataTypes(true); 118 SetSyncingAllDataTypes(true);
115 } 119 }
116 120
117 SyncSetupService::SyncServiceState SyncSetupService::GetSyncServiceState() { 121 SyncSetupService::SyncServiceState SyncSetupService::GetSyncServiceState() {
118 switch (sync_service_->GetAuthError().state()) { 122 switch (sync_service_->GetAuthError().state()) {
119 case GoogleServiceAuthError::REQUEST_CANCELED: 123 case GoogleServiceAuthError::REQUEST_CANCELED:
120 return kSyncServiceCouldNotConnect; 124 return kSyncServiceCouldNotConnect;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 bool sync_enabled) { 195 bool sync_enabled) {
192 sync_blocker_ = sync_service_->GetSetupInProgressHandle(); 196 sync_blocker_ = sync_service_->GetSetupInProgressHandle();
193 if (sync_enabled) { 197 if (sync_enabled) {
194 sync_service_->RequestStart(); 198 sync_service_->RequestStart();
195 } else { 199 } else {
196 UMA_HISTOGRAM_ENUMERATION("Sync.StopSource", syncer::CHROME_SYNC_SETTINGS, 200 UMA_HISTOGRAM_ENUMERATION("Sync.StopSource", syncer::CHROME_SYNC_SETTINGS,
197 syncer::STOP_SOURCE_LIMIT); 201 syncer::STOP_SOURCE_LIMIT);
198 sync_service_->RequestStop(syncer::SyncService::KEEP_DATA); 202 sync_service_->RequestStop(syncer::SyncService::KEEP_DATA);
199 } 203 }
200 } 204 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698