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

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

Issue 7977018: Enable sync for the settings from the Extension Settings API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix race condition in ExtensionSettingsUIWrapper::Core 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 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 PrefService::UNSYNCABLE_PREF); 308 PrefService::UNSYNCABLE_PREF);
309 pref_service->RegisterBooleanPref(prefs::kSyncAutofill, 309 pref_service->RegisterBooleanPref(prefs::kSyncAutofill,
310 enable_by_default, 310 enable_by_default,
311 PrefService::UNSYNCABLE_PREF); 311 PrefService::UNSYNCABLE_PREF);
312 pref_service->RegisterBooleanPref(prefs::kSyncThemes, 312 pref_service->RegisterBooleanPref(prefs::kSyncThemes,
313 enable_by_default, 313 enable_by_default,
314 PrefService::UNSYNCABLE_PREF); 314 PrefService::UNSYNCABLE_PREF);
315 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls, 315 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls,
316 enable_by_default, 316 enable_by_default,
317 PrefService::UNSYNCABLE_PREF); 317 PrefService::UNSYNCABLE_PREF);
318 pref_service->RegisterBooleanPref(prefs::kSyncExtensionSettings,
319 enable_by_default,
320 PrefService::UNSYNCABLE_PREF);
318 pref_service->RegisterBooleanPref(prefs::kSyncExtensions, 321 pref_service->RegisterBooleanPref(prefs::kSyncExtensions,
319 enable_by_default, 322 enable_by_default,
320 PrefService::UNSYNCABLE_PREF); 323 PrefService::UNSYNCABLE_PREF);
321 pref_service->RegisterBooleanPref(prefs::kSyncApps, 324 pref_service->RegisterBooleanPref(prefs::kSyncApps,
322 enable_by_default, 325 enable_by_default,
323 PrefService::UNSYNCABLE_PREF); 326 PrefService::UNSYNCABLE_PREF);
324 pref_service->RegisterBooleanPref(prefs::kSyncSearchEngines, 327 pref_service->RegisterBooleanPref(prefs::kSyncSearchEngines,
325 enable_by_default, 328 enable_by_default,
326 PrefService::UNSYNCABLE_PREF); 329 PrefService::UNSYNCABLE_PREF);
327 pref_service->RegisterBooleanPref(prefs::kSyncSessions, 330 pref_service->RegisterBooleanPref(prefs::kSyncSessions,
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 case syncable::PREFERENCES: 576 case syncable::PREFERENCES:
574 return prefs::kSyncPreferences; 577 return prefs::kSyncPreferences;
575 case syncable::AUTOFILL: 578 case syncable::AUTOFILL:
576 return prefs::kSyncAutofill; 579 return prefs::kSyncAutofill;
577 case syncable::AUTOFILL_PROFILE: 580 case syncable::AUTOFILL_PROFILE:
578 return prefs::kSyncAutofillProfile; 581 return prefs::kSyncAutofillProfile;
579 case syncable::THEMES: 582 case syncable::THEMES:
580 return prefs::kSyncThemes; 583 return prefs::kSyncThemes;
581 case syncable::TYPED_URLS: 584 case syncable::TYPED_URLS:
582 return prefs::kSyncTypedUrls; 585 return prefs::kSyncTypedUrls;
586 case syncable::EXTENSION_SETTINGS:
587 return prefs::kSyncExtensionSettings;
583 case syncable::EXTENSIONS: 588 case syncable::EXTENSIONS:
584 return prefs::kSyncExtensions; 589 return prefs::kSyncExtensions;
585 case syncable::APPS: 590 case syncable::APPS:
586 return prefs::kSyncApps; 591 return prefs::kSyncApps;
587 case syncable::SEARCH_ENGINES: 592 case syncable::SEARCH_ENGINES:
588 return prefs::kSyncSearchEngines; 593 return prefs::kSyncSearchEngines;
589 case syncable::SESSIONS: 594 case syncable::SESSIONS:
590 return prefs::kSyncSessions; 595 return prefs::kSyncSessions;
591 default: 596 default:
592 break; 597 break;
(...skipping 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after
1650 syncable::ModelTypeBitSetFromValue( 1655 syncable::ModelTypeBitSetFromValue(
1651 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes)); 1656 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes));
1652 syncable::ModelTypeSet registered; 1657 syncable::ModelTypeSet registered;
1653 GetRegisteredDataTypes(&registered); 1658 GetRegisteredDataTypes(&registered);
1654 syncable::ModelTypeBitSet registered_bit_set = 1659 syncable::ModelTypeBitSet registered_bit_set =
1655 syncable::ModelTypeBitSetFromSet(registered); 1660 syncable::ModelTypeBitSetFromSet(registered);
1656 unacknowledged = registered_bit_set & ~acknowledged; 1661 unacknowledged = registered_bit_set & ~acknowledged;
1657 } 1662 }
1658 return unacknowledged; 1663 return unacknowledged;
1659 } 1664 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_factory_mock.h ('k') | chrome/browser/sync/protocol/extension_setting_specifics.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698