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

Side by Side Diff: chrome/browser/sync/profile_sync_service.cc

Issue 2749005: Added extensions sync-related constants, switches, and clauses. (Closed)
Patch Set: Changed comment to be ocnsistent Created 10 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/sync/engine/syncapi.cc ('k') | chrome/browser/sync/syncable/model_type.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "chrome/browser/sync/profile_sync_service.h" 5 #include "chrome/browser/sync/profile_sync_service.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 bool enable_by_default = 204 bool enable_by_default =
205 !pref_service->HasPrefPath(prefs::kSyncHasSetupCompleted); 205 !pref_service->HasPrefPath(prefs::kSyncHasSetupCompleted);
206 #endif 206 #endif
207 207
208 pref_service->RegisterBooleanPref(prefs::kSyncBookmarks, true); 208 pref_service->RegisterBooleanPref(prefs::kSyncBookmarks, true);
209 pref_service->RegisterBooleanPref(prefs::kSyncPasswords, enable_by_default); 209 pref_service->RegisterBooleanPref(prefs::kSyncPasswords, enable_by_default);
210 pref_service->RegisterBooleanPref(prefs::kSyncPreferences, enable_by_default); 210 pref_service->RegisterBooleanPref(prefs::kSyncPreferences, enable_by_default);
211 pref_service->RegisterBooleanPref(prefs::kSyncAutofill, enable_by_default); 211 pref_service->RegisterBooleanPref(prefs::kSyncAutofill, enable_by_default);
212 pref_service->RegisterBooleanPref(prefs::kSyncThemes, enable_by_default); 212 pref_service->RegisterBooleanPref(prefs::kSyncThemes, enable_by_default);
213 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls, enable_by_default); 213 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls, enable_by_default);
214 pref_service->RegisterBooleanPref(prefs::kSyncExtensions, enable_by_default);
214 } 215 }
215 216
216 void ProfileSyncService::ClearPreferences() { 217 void ProfileSyncService::ClearPreferences() {
217 PrefService* pref_service = profile_->GetPrefs(); 218 PrefService* pref_service = profile_->GetPrefs();
218 pref_service->ClearPref(prefs::kSyncLastSyncedTime); 219 pref_service->ClearPref(prefs::kSyncLastSyncedTime);
219 pref_service->ClearPref(prefs::kSyncHasSetupCompleted); 220 pref_service->ClearPref(prefs::kSyncHasSetupCompleted);
220 // TODO(nick): The current behavior does not clear e.g. prefs::kSyncBookmarks. 221 // TODO(nick): The current behavior does not clear e.g. prefs::kSyncBookmarks.
221 // Is that really what we want? 222 // Is that really what we want?
222 pref_service->ScheduleSavePersistentPrefs(); 223 pref_service->ScheduleSavePersistentPrefs();
223 } 224 }
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 case syncable::PASSWORD: 386 case syncable::PASSWORD:
386 return prefs::kSyncPasswords; 387 return prefs::kSyncPasswords;
387 case syncable::PREFERENCES: 388 case syncable::PREFERENCES:
388 return prefs::kSyncPreferences; 389 return prefs::kSyncPreferences;
389 case syncable::AUTOFILL: 390 case syncable::AUTOFILL:
390 return prefs::kSyncAutofill; 391 return prefs::kSyncAutofill;
391 case syncable::THEMES: 392 case syncable::THEMES:
392 return prefs::kSyncThemes; 393 return prefs::kSyncThemes;
393 case syncable::TYPED_URLS: 394 case syncable::TYPED_URLS:
394 return prefs::kSyncTypedUrls; 395 return prefs::kSyncTypedUrls;
396 case syncable::EXTENSIONS:
397 return prefs::kSyncExtensions;
395 default: 398 default:
396 NOTREACHED(); 399 NOTREACHED();
397 return NULL; 400 return NULL;
398 } 401 }
399 } 402 }
400 403
401 // An invariant has been violated. Transition to an error state where we try 404 // An invariant has been violated. Transition to an error state where we try
402 // to do as little work as possible, to avoid further corruption or crashes. 405 // to do as little work as possible, to avoid further corruption or crashes.
403 void ProfileSyncService::OnUnrecoverableError( 406 void ProfileSyncService::OnUnrecoverableError(
404 const tracked_objects::Location& from_here, 407 const tracked_objects::Location& from_here,
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 // is initialized, all enabled data types are consistent with one 727 // is initialized, all enabled data types are consistent with one
725 // another, and no unrecoverable error has transpired. 728 // another, and no unrecoverable error has transpired.
726 if (unrecoverable_error_detected_) 729 if (unrecoverable_error_detected_)
727 return false; 730 return false;
728 731
729 if (!data_type_manager_.get()) 732 if (!data_type_manager_.get())
730 return false; 733 return false;
731 734
732 return data_type_manager_->state() == DataTypeManager::CONFIGURED; 735 return data_type_manager_->state() == DataTypeManager::CONFIGURED;
733 } 736 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/syncapi.cc ('k') | chrome/browser/sync/syncable/model_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698