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

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: Fixed notification registration. Created 9 years, 3 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 <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 PrefService::UNSYNCABLE_PREF); 300 PrefService::UNSYNCABLE_PREF);
301 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls, 301 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls,
302 enable_by_default, 302 enable_by_default,
303 PrefService::UNSYNCABLE_PREF); 303 PrefService::UNSYNCABLE_PREF);
304 pref_service->RegisterBooleanPref(prefs::kSyncExtensions, 304 pref_service->RegisterBooleanPref(prefs::kSyncExtensions,
305 enable_by_default, 305 enable_by_default,
306 PrefService::UNSYNCABLE_PREF); 306 PrefService::UNSYNCABLE_PREF);
307 pref_service->RegisterBooleanPref(prefs::kSyncApps, 307 pref_service->RegisterBooleanPref(prefs::kSyncApps,
308 enable_by_default, 308 enable_by_default,
309 PrefService::UNSYNCABLE_PREF); 309 PrefService::UNSYNCABLE_PREF);
310 pref_service->RegisterBooleanPref(prefs::kSyncSearchEngines,
311 enable_by_default,
312 PrefService::UNSYNCABLE_PREF);
310 pref_service->RegisterBooleanPref(prefs::kSyncSessions, 313 pref_service->RegisterBooleanPref(prefs::kSyncSessions,
311 enable_by_default, 314 enable_by_default,
312 PrefService::UNSYNCABLE_PREF); 315 PrefService::UNSYNCABLE_PREF);
313 pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced, 316 pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced,
314 enable_by_default, 317 enable_by_default,
315 PrefService::UNSYNCABLE_PREF); 318 PrefService::UNSYNCABLE_PREF);
316 pref_service->RegisterBooleanPref(prefs::kSyncManaged, 319 pref_service->RegisterBooleanPref(prefs::kSyncManaged,
317 false, 320 false,
318 PrefService::UNSYNCABLE_PREF); 321 PrefService::UNSYNCABLE_PREF);
319 pref_service->RegisterStringPref(prefs::kEncryptionBootstrapToken, 322 pref_service->RegisterStringPref(prefs::kEncryptionBootstrapToken,
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 case syncable::AUTOFILL_PROFILE: 539 case syncable::AUTOFILL_PROFILE:
537 return prefs::kSyncAutofillProfile; 540 return prefs::kSyncAutofillProfile;
538 case syncable::THEMES: 541 case syncable::THEMES:
539 return prefs::kSyncThemes; 542 return prefs::kSyncThemes;
540 case syncable::TYPED_URLS: 543 case syncable::TYPED_URLS:
541 return prefs::kSyncTypedUrls; 544 return prefs::kSyncTypedUrls;
542 case syncable::EXTENSIONS: 545 case syncable::EXTENSIONS:
543 return prefs::kSyncExtensions; 546 return prefs::kSyncExtensions;
544 case syncable::APPS: 547 case syncable::APPS:
545 return prefs::kSyncApps; 548 return prefs::kSyncApps;
549 case syncable::SEARCH_ENGINES:
550 return prefs::kSyncSearchEngines;
546 case syncable::SESSIONS: 551 case syncable::SESSIONS:
547 return prefs::kSyncSessions; 552 return prefs::kSyncSessions;
548 default: 553 default:
549 break; 554 break;
550 } 555 }
551 NOTREACHED(); 556 NOTREACHED();
552 return NULL; 557 return NULL;
553 } 558 }
554 559
555 // static 560 // static
(...skipping 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after
1574 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes)); 1579 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes));
1575 syncable::ModelTypeSet registered; 1580 syncable::ModelTypeSet registered;
1576 GetRegisteredDataTypes(&registered); 1581 GetRegisteredDataTypes(&registered);
1577 syncable::ModelTypeBitSet registered_bit_set = 1582 syncable::ModelTypeBitSet registered_bit_set =
1578 syncable::ModelTypeBitSetFromSet(registered); 1583 syncable::ModelTypeBitSetFromSet(registered);
1579 unacknowledged = registered_bit_set & ~acknowledged; 1584 unacknowledged = registered_bit_set & ~acknowledged;
1580 } 1585 }
1581 return unacknowledged; 1586 return unacknowledged;
1582 } 1587 }
1583 1588
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_factory_mock.h ('k') | chrome/browser/sync/protocol/proto_value_conversions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698