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

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 1102733002: Remove most occurences of PrefRegistrySyncable::UNSYNCABLE_PREF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs-add-reg-funcs
Patch Set: Created 5 years, 7 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
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/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 302
303 // static 303 // static
304 int ProfileImpl::create_readme_delay_ms = 60000; 304 int ProfileImpl::create_readme_delay_ms = 60000;
305 305
306 // static 306 // static
307 const char* const ProfileImpl::kPrefExitTypeNormal = "Normal"; 307 const char* const ProfileImpl::kPrefExitTypeNormal = "Normal";
308 308
309 // static 309 // static
310 void ProfileImpl::RegisterProfilePrefs( 310 void ProfileImpl::RegisterProfilePrefs(
311 user_prefs::PrefRegistrySyncable* registry) { 311 user_prefs::PrefRegistrySyncable* registry) {
312 registry->RegisterBooleanPref( 312 registry->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false);
313 prefs::kSavingBrowserHistoryDisabled, 313 registry->RegisterBooleanPref(prefs::kAllowDeletingBrowserHistory, true);
314 false, 314 registry->RegisterBooleanPref(prefs::kSigninAllowed, true);
315 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 315 registry->RegisterBooleanPref(prefs::kForceGoogleSafeSearch, false);
316 registry->RegisterBooleanPref( 316 registry->RegisterBooleanPref(prefs::kForceYouTubeSafetyMode, false);
317 prefs::kAllowDeletingBrowserHistory, 317 registry->RegisterBooleanPref(prefs::kRecordHistory, false);
318 true,
319 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
320 registry->RegisterBooleanPref(
321 prefs::kSigninAllowed,
322 true,
323 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
324 registry->RegisterBooleanPref(
325 prefs::kForceGoogleSafeSearch,
326 false,
327 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
328 registry->RegisterBooleanPref(
329 prefs::kForceYouTubeSafetyMode,
330 false,
331 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
332 registry->RegisterBooleanPref(
333 prefs::kRecordHistory,
334 false,
335 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
336 registry->RegisterIntegerPref( 318 registry->RegisterIntegerPref(
337 prefs::kProfileAvatarIndex, 319 prefs::kProfileAvatarIndex,
338 -1, 320 -1,
339 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 321 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
340 // Whether a profile is using an avatar without having explicitely chosen it 322 // Whether a profile is using an avatar without having explicitely chosen it
341 // (i.e. was assigned by default by legacy profile creation). 323 // (i.e. was assigned by default by legacy profile creation).
342 registry->RegisterBooleanPref( 324 registry->RegisterBooleanPref(
343 prefs::kProfileUsingDefaultAvatar, 325 prefs::kProfileUsingDefaultAvatar,
344 true, 326 true,
345 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 327 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
346 registry->RegisterBooleanPref( 328 registry->RegisterBooleanPref(
347 prefs::kProfileUsingGAIAAvatar, 329 prefs::kProfileUsingGAIAAvatar,
348 false, 330 false,
349 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 331 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
350 // Whether a profile is using a default avatar name (eg. Pickles or Person 1). 332 // Whether a profile is using a default avatar name (eg. Pickles or Person 1).
351 registry->RegisterBooleanPref( 333 registry->RegisterBooleanPref(
352 prefs::kProfileUsingDefaultName, 334 prefs::kProfileUsingDefaultName,
353 true, 335 true,
354 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 336 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
355 registry->RegisterStringPref( 337 registry->RegisterStringPref(prefs::kSupervisedUserId, std::string());
356 prefs::kSupervisedUserId,
357 std::string(),
358 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
359 registry->RegisterStringPref(prefs::kProfileName, 338 registry->RegisterStringPref(prefs::kProfileName,
360 std::string(), 339 std::string(),
361 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 340 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
362 registry->RegisterStringPref(prefs::kHomePage, 341 registry->RegisterStringPref(prefs::kHomePage,
363 std::string(), 342 std::string(),
364 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 343 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
365 #if defined(ENABLE_PRINTING) 344 #if defined(ENABLE_PRINTING)
366 registry->RegisterBooleanPref( 345 registry->RegisterBooleanPref(prefs::kPrintingEnabled, true);
367 prefs::kPrintingEnabled,
368 true,
369 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
370 #endif 346 #endif
371 registry->RegisterBooleanPref( 347 registry->RegisterBooleanPref(prefs::kPrintPreviewDisabled, false);
372 prefs::kPrintPreviewDisabled, 348 registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
373 false,
374 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
375 registry->RegisterBooleanPref(
376 prefs::kForceEphemeralProfiles,
377 false,
378 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
379 349
380 // Initialize the cache prefs. 350 // Initialize the cache prefs.
381 registry->RegisterFilePathPref( 351 registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath());
382 prefs::kDiskCacheDir, 352 registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0);
383 base::FilePath(), 353 registry->RegisterIntegerPref(prefs::kMediaCacheSize, 0);
384 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
385 registry->RegisterIntegerPref(
386 prefs::kDiskCacheSize,
387 0,
388 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
389 registry->RegisterIntegerPref(
390 prefs::kMediaCacheSize,
391 0,
392 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
393 354
394 // Deprecated. Kept around for migration. 355 // Deprecated. Kept around for migration.
395 registry->RegisterBooleanPref( 356 registry->RegisterBooleanPref(
396 prefs::kClearSiteDataOnExit, 357 prefs::kClearSiteDataOnExit,
397 false, 358 false,
398 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 359 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
399 } 360 }
400 361
401 ProfileImpl::ProfileImpl( 362 ProfileImpl::ProfileImpl(
402 const base::FilePath& path, 363 const base::FilePath& path,
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after
1335 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { 1296 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
1336 domain_reliability::DomainReliabilityService* service = 1297 domain_reliability::DomainReliabilityService* service =
1337 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1298 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1338 GetForBrowserContext(this); 1299 GetForBrowserContext(this);
1339 if (!service) 1300 if (!service)
1340 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1301 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1341 1302
1342 return service->CreateMonitor( 1303 return service->CreateMonitor(
1343 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1304 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1344 } 1305 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/push_messaging/push_messaging_application_id.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698