diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 10:27:00 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 10:27:00 +0000 |
| commit | b8de5baaf5b6132318158816a23a1d00a77b4080 (patch) | |
| tree | 59a8c3aeb26f2f93a62a43c7785f63daffc9898d /components/sync_driver | |
| parent | 51415b4e3bcfa36e9b9f08cbb25cf6c64f28472b (diff) | |
| download | chromium_src-b8de5baaf5b6132318158816a23a1d00a77b4080.zip chromium_src-b8de5baaf5b6132318158816a23a1d00a77b4080.tar.gz chromium_src-b8de5baaf5b6132318158816a23a1d00a77b4080.tar.bz2 | |
Restore alphabetic order after "managed user" -> "supervised user" rename.
TBR=zea@chromium.org,sky@chromium.org
BUG=385113
Review URL: https://codereview.chromium.org/341893008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/sync_driver')
| -rw-r--r-- | components/sync_driver/pref_names.cc | 10 | ||||
| -rw-r--r-- | components/sync_driver/pref_names.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/components/sync_driver/pref_names.cc b/components/sync_driver/pref_names.cc index e4e0373..d1568bc 100644 --- a/components/sync_driver/pref_names.cc +++ b/components/sync_driver/pref_names.cc @@ -34,6 +34,7 @@ const char kSyncAppList[] = "sync.app_list"; const char kSyncAppNotifications[] = "sync.app_notifications"; const char kSyncAppSettings[] = "sync.app_settings"; const char kSyncApps[] = "sync.apps"; +const char kSyncArticles[] = "sync.articles"; const char kSyncAutofillProfile[] = "sync.autofill_profile"; const char kSyncAutofill[] = "sync.autofill"; const char kSyncBookmarks[] = "sync.bookmarks"; @@ -43,16 +44,15 @@ const char kSyncExtensions[] = "sync.extensions"; const char kSyncFaviconImages[] = "sync.favicon_images"; const char kSyncFaviconTracking[] = "sync.favicon_tracking"; const char kSyncHistoryDeleteDirectives[] = "sync.history_delete_directives"; -const char kSyncSupervisedUserSettings[] = "sync.managed_user_settings"; -const char kSyncSupervisedUserSharedSettings[] = - "sync.managed_user_shared_settings"; -const char kSyncSupervisedUsers[] = "sync.managed_users"; -const char kSyncArticles[] = "sync.articles"; const char kSyncPasswords[] = "sync.passwords"; const char kSyncPreferences[] = "sync.preferences"; const char kSyncPriorityPreferences[] = "sync.priority_preferences"; const char kSyncSearchEngines[] = "sync.search_engines"; const char kSyncSessions[] = "sync.sessions"; +const char kSyncSupervisedUserSettings[] = "sync.managed_user_settings"; +const char kSyncSupervisedUserSharedSettings[] = + "sync.managed_user_shared_settings"; +const char kSyncSupervisedUsers[] = "sync.managed_users"; const char kSyncSyncedNotificationAppInfo[] = "sync.synced_notification_app_info"; const char kSyncSyncedNotifications[] = "sync.synced_notifications"; diff --git a/components/sync_driver/pref_names.h b/components/sync_driver/pref_names.h index 8b580da..2341ecd 100644 --- a/components/sync_driver/pref_names.h +++ b/components/sync_driver/pref_names.h @@ -22,6 +22,7 @@ extern const char kSyncAppList[]; extern const char kSyncAppNotifications[]; extern const char kSyncAppSettings[]; extern const char kSyncApps[]; +extern const char kSyncArticles[]; extern const char kSyncAutofillProfile[]; extern const char kSyncAutofill[]; extern const char kSyncBookmarks[]; @@ -31,15 +32,14 @@ extern const char kSyncExtensions[]; extern const char kSyncFaviconImages[]; extern const char kSyncFaviconTracking[]; extern const char kSyncHistoryDeleteDirectives[]; -extern const char kSyncSupervisedUserSettings[]; -extern const char kSyncSupervisedUserSharedSettings[]; -extern const char kSyncSupervisedUsers[]; -extern const char kSyncArticles[]; extern const char kSyncPasswords[]; extern const char kSyncPreferences[]; extern const char kSyncPriorityPreferences[]; extern const char kSyncSearchEngines[]; extern const char kSyncSessions[]; +extern const char kSyncSupervisedUserSettings[]; +extern const char kSyncSupervisedUserSharedSettings[]; +extern const char kSyncSupervisedUsers[]; extern const char kSyncSyncedNotificationAppInfo[]; extern const char kSyncSyncedNotifications[]; extern const char kSyncTabs[]; |