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

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

Issue 7669052: Added DataTypeController integration and UI surfacing for syncing Search Engines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Initial upload. Created 9 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <stddef.h> 7 #include <stddef.h>
8 #include <map> 8 #include <map>
9 #include <ostream> 9 #include <ostream>
10 #include <set> 10 #include <set>
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 PrefService::UNSYNCABLE_PREF); 296 PrefService::UNSYNCABLE_PREF);
297 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls, 297 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls,
298 enable_by_default, 298 enable_by_default,
299 PrefService::UNSYNCABLE_PREF); 299 PrefService::UNSYNCABLE_PREF);
300 pref_service->RegisterBooleanPref(prefs::kSyncExtensions, 300 pref_service->RegisterBooleanPref(prefs::kSyncExtensions,
301 enable_by_default, 301 enable_by_default,
302 PrefService::UNSYNCABLE_PREF); 302 PrefService::UNSYNCABLE_PREF);
303 pref_service->RegisterBooleanPref(prefs::kSyncApps, 303 pref_service->RegisterBooleanPref(prefs::kSyncApps,
304 enable_by_default, 304 enable_by_default,
305 PrefService::UNSYNCABLE_PREF); 305 PrefService::UNSYNCABLE_PREF);
306 pref_service->RegisterBooleanPref(prefs::kSyncSearchEngines,
307 enable_by_default,
308 PrefService::UNSYNCABLE_PREF);
306 pref_service->RegisterBooleanPref(prefs::kSyncSessions, 309 pref_service->RegisterBooleanPref(prefs::kSyncSessions,
307 enable_by_default, 310 enable_by_default,
308 PrefService::UNSYNCABLE_PREF); 311 PrefService::UNSYNCABLE_PREF);
309 pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced, 312 pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced,
310 enable_by_default, 313 enable_by_default,
311 PrefService::UNSYNCABLE_PREF); 314 PrefService::UNSYNCABLE_PREF);
312 pref_service->RegisterBooleanPref(prefs::kSyncManaged, 315 pref_service->RegisterBooleanPref(prefs::kSyncManaged,
313 false, 316 false,
314 PrefService::UNSYNCABLE_PREF); 317 PrefService::UNSYNCABLE_PREF);
315 pref_service->RegisterStringPref(prefs::kEncryptionBootstrapToken, 318 pref_service->RegisterStringPref(prefs::kEncryptionBootstrapToken,
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 case syncable::AUTOFILL_PROFILE: 535 case syncable::AUTOFILL_PROFILE:
533 return prefs::kSyncAutofillProfile; 536 return prefs::kSyncAutofillProfile;
534 case syncable::THEMES: 537 case syncable::THEMES:
535 return prefs::kSyncThemes; 538 return prefs::kSyncThemes;
536 case syncable::TYPED_URLS: 539 case syncable::TYPED_URLS:
537 return prefs::kSyncTypedUrls; 540 return prefs::kSyncTypedUrls;
538 case syncable::EXTENSIONS: 541 case syncable::EXTENSIONS:
539 return prefs::kSyncExtensions; 542 return prefs::kSyncExtensions;
540 case syncable::APPS: 543 case syncable::APPS:
541 return prefs::kSyncApps; 544 return prefs::kSyncApps;
545 case syncable::SEARCH_ENGINES:
546 return prefs::kSyncSearchEngines;
542 case syncable::SESSIONS: 547 case syncable::SESSIONS:
543 return prefs::kSyncSessions; 548 return prefs::kSyncSessions;
544 default: 549 default:
545 break; 550 break;
546 } 551 }
547 NOTREACHED(); 552 NOTREACHED();
548 return NULL; 553 return NULL;
549 } 554 }
550 555
551 // An invariant has been violated. Transition to an error state where we try 556 // An invariant has been violated. Transition to an error state where we try
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes)); 1466 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes));
1462 syncable::ModelTypeSet registered; 1467 syncable::ModelTypeSet registered;
1463 GetRegisteredDataTypes(&registered); 1468 GetRegisteredDataTypes(&registered);
1464 syncable::ModelTypeBitSet registered_bit_set = 1469 syncable::ModelTypeBitSet registered_bit_set =
1465 syncable::ModelTypeBitSetFromSet(registered); 1470 syncable::ModelTypeBitSetFromSet(registered);
1466 unacknowledged = registered_bit_set & ~acknowledged; 1471 unacknowledged = registered_bit_set & ~acknowledged;
1467 } 1472 }
1468 return unacknowledged; 1473 return unacknowledged;
1469 } 1474 }
1470 1475
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698