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

Side by Side Diff: components/sync_driver/sync_prefs.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 | « components/sync_driver/pref_names.cc ('k') | google_apis/gaia/gaia_constants.h » ('j') | 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 "components/sync_driver/sync_prefs.h" 5 #include "components/sync_driver/sync_prefs.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_member.h" 9 #include "base/prefs/pref_member.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 case syncer::SYNCED_NOTIFICATIONS: 323 case syncer::SYNCED_NOTIFICATIONS:
324 return prefs::kSyncSyncedNotifications; 324 return prefs::kSyncSyncedNotifications;
325 case syncer::SYNCED_NOTIFICATION_APP_INFO: 325 case syncer::SYNCED_NOTIFICATION_APP_INFO:
326 return prefs::kSyncSyncedNotificationAppInfo; 326 return prefs::kSyncSyncedNotificationAppInfo;
327 case syncer::DICTIONARY: 327 case syncer::DICTIONARY:
328 return prefs::kSyncDictionary; 328 return prefs::kSyncDictionary;
329 case syncer::FAVICON_IMAGES: 329 case syncer::FAVICON_IMAGES:
330 return prefs::kSyncFaviconImages; 330 return prefs::kSyncFaviconImages;
331 case syncer::FAVICON_TRACKING: 331 case syncer::FAVICON_TRACKING:
332 return prefs::kSyncFaviconTracking; 332 return prefs::kSyncFaviconTracking;
333 case syncer::MANAGED_USER_SETTINGS: 333 case syncer::SUPERVISED_USER_SETTINGS:
334 return prefs::kSyncManagedUserSettings; 334 return prefs::kSyncSupervisedUserSettings;
335 case syncer::PROXY_TABS: 335 case syncer::PROXY_TABS:
336 return prefs::kSyncTabs; 336 return prefs::kSyncTabs;
337 case syncer::PRIORITY_PREFERENCES: 337 case syncer::PRIORITY_PREFERENCES:
338 return prefs::kSyncPriorityPreferences; 338 return prefs::kSyncPriorityPreferences;
339 case syncer::MANAGED_USERS: 339 case syncer::SUPERVISED_USERS:
340 return prefs::kSyncManagedUsers; 340 return prefs::kSyncSupervisedUsers;
341 case syncer::ARTICLES: 341 case syncer::ARTICLES:
342 return prefs::kSyncArticles; 342 return prefs::kSyncArticles;
343 case syncer::MANAGED_USER_SHARED_SETTINGS: 343 case syncer::SUPERVISED_USER_SHARED_SETTINGS:
344 return prefs::kSyncManagedUserSharedSettings; 344 return prefs::kSyncSupervisedUserSharedSettings;
345 default: 345 default:
346 break; 346 break;
347 } 347 }
348 NOTREACHED(); 348 NOTREACHED();
349 return NULL; 349 return NULL;
350 } 350 }
351 351
352 #if defined(OS_CHROMEOS) 352 #if defined(OS_CHROMEOS)
353 std::string SyncPrefs::GetSpareBootstrapToken() const { 353 std::string SyncPrefs::GetSpareBootstrapToken() const {
354 DCHECK(CalledOnValidThread()); 354 DCHECK(CalledOnValidThread());
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 416
417 pref_groups_[syncer::TYPED_URLS].Put(syncer::HISTORY_DELETE_DIRECTIVES); 417 pref_groups_[syncer::TYPED_URLS].Put(syncer::HISTORY_DELETE_DIRECTIVES);
418 pref_groups_[syncer::TYPED_URLS].Put(syncer::SESSIONS); 418 pref_groups_[syncer::TYPED_URLS].Put(syncer::SESSIONS);
419 pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_IMAGES); 419 pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_IMAGES);
420 pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_TRACKING); 420 pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_TRACKING);
421 421
422 pref_groups_[syncer::PROXY_TABS].Put(syncer::SESSIONS); 422 pref_groups_[syncer::PROXY_TABS].Put(syncer::SESSIONS);
423 pref_groups_[syncer::PROXY_TABS].Put(syncer::FAVICON_IMAGES); 423 pref_groups_[syncer::PROXY_TABS].Put(syncer::FAVICON_IMAGES);
424 pref_groups_[syncer::PROXY_TABS].Put(syncer::FAVICON_TRACKING); 424 pref_groups_[syncer::PROXY_TABS].Put(syncer::FAVICON_TRACKING);
425 425
426 pref_groups_[syncer::MANAGED_USER_SETTINGS].Put(syncer::SESSIONS); 426 pref_groups_[syncer::SUPERVISED_USER_SETTINGS].Put(syncer::SESSIONS);
427 427
428 // TODO(zea): put favicons in the bookmarks group as well once it handles 428 // TODO(zea): put favicons in the bookmarks group as well once it handles
429 // those favicons. 429 // those favicons.
430 } 430 }
431 431
432 // static 432 // static
433 void SyncPrefs::RegisterDataTypePreferredPref( 433 void SyncPrefs::RegisterDataTypePreferredPref(
434 user_prefs::PrefRegistrySyncable* registry, 434 user_prefs::PrefRegistrySyncable* registry,
435 syncer::ModelType type, 435 syncer::ModelType type,
436 bool is_preferred) { 436 bool is_preferred) {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 496
497 void SyncPrefs::SetFirstSyncTime(base::Time time) { 497 void SyncPrefs::SetFirstSyncTime(base::Time time) {
498 pref_service_->SetInt64(prefs::kSyncFirstSyncTime, time.ToInternalValue()); 498 pref_service_->SetInt64(prefs::kSyncFirstSyncTime, time.ToInternalValue());
499 } 499 }
500 500
501 void SyncPrefs::ClearFirstSyncTime() { 501 void SyncPrefs::ClearFirstSyncTime() {
502 pref_service_->ClearPref(prefs::kSyncFirstSyncTime); 502 pref_service_->ClearPref(prefs::kSyncFirstSyncTime);
503 } 503 }
504 504
505 } // namespace browser_sync 505 } // namespace browser_sync
OLDNEW
« no previous file with comments | « components/sync_driver/pref_names.cc ('k') | google_apis/gaia/gaia_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698