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

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

Issue 10960057: Enable all registered types by default on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host.cc ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/sync/sync_prefs.h" 5 #include "chrome/browser/sync/sync_prefs.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 pref_service_->RegisterBooleanPref(prefs::kSyncHasSetupCompleted, 314 pref_service_->RegisterBooleanPref(prefs::kSyncHasSetupCompleted,
315 false, 315 false,
316 PrefService::UNSYNCABLE_PREF); 316 PrefService::UNSYNCABLE_PREF);
317 pref_service_->RegisterBooleanPref(prefs::kSyncSuppressStart, 317 pref_service_->RegisterBooleanPref(prefs::kSyncSuppressStart,
318 false, 318 false,
319 PrefService::UNSYNCABLE_PREF); 319 PrefService::UNSYNCABLE_PREF);
320 pref_service_->RegisterInt64Pref(prefs::kSyncLastSyncedTime, 320 pref_service_->RegisterInt64Pref(prefs::kSyncLastSyncedTime,
321 0, 321 0,
322 PrefService::UNSYNCABLE_PREF); 322 PrefService::UNSYNCABLE_PREF);
323 323
324 // If you've never synced before, or if you're using Chrome OS, all datatypes 324 // If you've never synced before, or if you're using Chrome OS or Android,
325 // are on by default. 325 // all datatypes are on by default.
326 // TODO(nick): Perhaps a better model would be to always default to false, 326 // TODO(nick): Perhaps a better model would be to always default to false,
327 // and explicitly call SetDataTypes() when the user shows the wizard. 327 // and explicitly call SetDataTypes() when the user shows the wizard.
328 #if defined(OS_CHROMEOS) 328 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
329 bool enable_by_default = true; 329 bool enable_by_default = true;
330 #else 330 #else
331 bool enable_by_default = 331 bool enable_by_default =
332 !pref_service_->HasPrefPath(prefs::kSyncHasSetupCompleted); 332 !pref_service_->HasPrefPath(prefs::kSyncHasSetupCompleted);
333 #endif 333 #endif
334 334
335 pref_service_->RegisterBooleanPref(prefs::kSyncKeepEverythingSynced, 335 pref_service_->RegisterBooleanPref(prefs::kSyncKeepEverythingSynced,
336 enable_by_default, 336 enable_by_default,
337 PrefService::UNSYNCABLE_PREF); 337 PrefService::UNSYNCABLE_PREF);
338 338
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 if (types.Has(i->first)) 433 if (types.Has(i->first))
434 types_with_groups.PutAll(i->second); 434 types_with_groups.PutAll(i->second);
435 else 435 else
436 types_with_groups.RemoveAll(i->second); 436 types_with_groups.RemoveAll(i->second);
437 } 437 }
438 types_with_groups.RetainAll(registered_types); 438 types_with_groups.RetainAll(registered_types);
439 return types_with_groups; 439 return types_with_groups;
440 } 440 }
441 441
442 } // namespace browser_sync 442 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698