diff options
| -rw-r--r-- | chrome/browser/supervised_user/supervised_user_shared_settings_service.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_constants.cc | 4 | ||||
| -rw-r--r-- | chrome/common/chrome_constants.h | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 18 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 6 | ||||
| -rw-r--r-- | chrome/common/pref_names.cc | 52 | ||||
| -rw-r--r-- | chrome/common/pref_names.h | 14 | ||||
| -rw-r--r-- | chrome/common/url_constants.cc | 2 | ||||
| -rw-r--r-- | chrome/common/url_constants.h | 2 | ||||
| -rw-r--r-- | components/sync_driver/pref_names.cc | 10 | ||||
| -rw-r--r-- | components/sync_driver/pref_names.h | 8 |
11 files changed, 60 insertions, 60 deletions
diff --git a/chrome/browser/supervised_user/supervised_user_shared_settings_service.cc b/chrome/browser/supervised_user/supervised_user_shared_settings_service.cc index 042654a..af23c0a 100644 --- a/chrome/browser/supervised_user/supervised_user_shared_settings_service.cc +++ b/chrome/browser/supervised_user/supervised_user_shared_settings_service.cc @@ -20,8 +20,8 @@ using base::DictionaryValue; using base::Value; -using syncer::SUPERVISED_USER_SHARED_SETTINGS; using syncer::ModelType; +using syncer::SUPERVISED_USER_SHARED_SETTINGS; using syncer::SyncChange; using syncer::SyncChangeList; using syncer::SyncChangeProcessor; diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc index 4f76d4f..c6f8ebb 100644 --- a/chrome/common/chrome_constants.cc +++ b/chrome/common/chrome_constants.cc @@ -169,8 +169,6 @@ const base::FilePath::CharType kJumpListIconDirname[] = FPL("JumpListIcons"); const base::FilePath::CharType kLocalStateFilename[] = FPL("Local State"); const base::FilePath::CharType kLocalStorePoolName[] = FPL("LocalStorePool"); const base::FilePath::CharType kLoginDataFileName[] = FPL("Login Data"); -const base::FilePath::CharType kSupervisedUserSettingsFilename[] = - FPL("Managed Mode Settings"); const base::FilePath::CharType kMediaCacheDirname[] = FPL("Media Cache"); const base::FilePath::CharType kNewTabThumbnailsFilename[] = FPL("Top Thumbnails"); @@ -192,6 +190,8 @@ const base::FilePath::CharType kSingletonCookieFilename[] = const base::FilePath::CharType kSingletonLockFilename[] = FPL("SingletonLock"); const base::FilePath::CharType kSingletonSocketFilename[] = FPL("SingletonSocket"); +const base::FilePath::CharType kSupervisedUserSettingsFilename[] = + FPL("Managed Mode Settings"); const base::FilePath::CharType kSyncCredentialsFilename[] = FPL("Sync Credentials"); const base::FilePath::CharType kThemePackFilename[] = FPL("Cached Theme.pak"); diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h index 6b85b5b..926b772 100644 --- a/chrome/common/chrome_constants.h +++ b/chrome/common/chrome_constants.h @@ -70,7 +70,6 @@ extern const base::FilePath::CharType kJumpListIconDirname[]; extern const base::FilePath::CharType kLocalStateFilename[]; extern const base::FilePath::CharType kLocalStorePoolName[]; extern const base::FilePath::CharType kLoginDataFileName[]; -extern const base::FilePath::CharType kSupervisedUserSettingsFilename[]; extern const base::FilePath::CharType kMediaCacheDirname[]; extern const base::FilePath::CharType kNewTabThumbnailsFilename[]; extern const base::FilePath::CharType kOBCertFilename[]; @@ -85,6 +84,7 @@ extern const base::FilePath::CharType kShortcutsDatabaseName[]; extern const base::FilePath::CharType kSingletonCookieFilename[]; extern const base::FilePath::CharType kSingletonLockFilename[]; extern const base::FilePath::CharType kSingletonSocketFilename[]; +extern const base::FilePath::CharType kSupervisedUserSettingsFilename[]; extern const base::FilePath::CharType kSyncCredentialsFilename[]; extern const base::FilePath::CharType kThemePackFilename[]; extern const base::FilePath::CharType kThumbnailsFilename[]; diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 8c4d0cb..3a12539 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -821,15 +821,6 @@ const char kMalwareInterstitialV3History[] = "malware-interstitial-v3-history"; // Makes Chrome default browser const char kMakeDefaultBrowser[] = "make-default-browser"; -// Sets the supervised user ID for any loaded or newly created profile to the -// given value. Pass an empty string to mark the profile as non-supervised. -// Used for testing. -const char kSupervisedUserId[] = "managed-user-id"; - -// Used to authenticate requests to the Sync service for supervised users. -// Setting this switch also causes Sync to be set up for a supervised user. -const char kSupervisedUserSyncToken[] = "managed-user-sync-token"; - // Use to opt-in user into Finch experiment groups. const char kManualEnhancedBookmarks[] = "manual-enhanced-bookmarks"; const char kManualEnhancedBookmarksOptout[] = @@ -1172,6 +1163,15 @@ const char kSuggestionNtpGaussianFilter[] = "suggestion-ntp-gaussian-filter"; // of day. const char kSuggestionNtpLinearFilter[] = "suggestion-ntp-linear-filter"; +// Sets the supervised user ID for any loaded or newly created profile to the +// given value. Pass an empty string to mark the profile as non-supervised. +// Used for testing. +const char kSupervisedUserId[] = "managed-user-id"; + +// Used to authenticate requests to the Sync service for supervised users. +// Setting this switch also causes Sync to be set up for a supervised user. +const char kSupervisedUserSyncToken[] = "managed-user-sync-token"; + // This flag causes sync to retry very quickly (see polling_constants.h) the // when it encounters an error, as the first step towards exponential backoff. const char kSyncShortInitialRetryOverride[] = diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index af4b8d0..53c2a9f 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -230,15 +230,13 @@ extern const char kLedgerTracingToken[]; extern const char kLimitedInstallFromWebstore[]; extern const char kLoadComponentExtension[]; extern const char kLoadExtension[]; +extern const char kMakeDefaultBrowser[]; extern const char kMalwareInterstitialV2[]; extern const char kMalwareInterstitialV3[]; extern const char kMalwareInterstitialV3Advice[]; extern const char kMalwareInterstitialV3Social[]; extern const char kMalwareInterstitialV3NotRecommend[]; extern const char kMalwareInterstitialV3History[]; -extern const char kMakeDefaultBrowser[]; -extern const char kSupervisedUserId[]; -extern const char kSupervisedUserSyncToken[]; extern const char kManualEnhancedBookmarks[]; extern const char kManualEnhancedBookmarksOptout[]; extern const char kMediaCacheSize[]; @@ -328,6 +326,8 @@ extern const char kStartMaximized[]; extern const char kSuggestionNtpFilterWidth[]; extern const char kSuggestionNtpGaussianFilter[]; extern const char kSuggestionNtpLinearFilter[]; +extern const char kSupervisedUserId[]; +extern const char kSupervisedUserSyncToken[]; extern const char kSyncShortInitialRetryOverride[]; extern const char kSyncServiceURL[]; extern const char kSyncDisableDeferredStartup[]; diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index 5f08b92..2b2282c 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -27,31 +27,16 @@ const char kDefaultAppsInstalled[] = "default_apps_installed"; // handling code reads local state, while extension APIs use profile pref. const char kDisableScreenshots[] = "disable_screenshots"; +// If set to true profiles are created in ephemeral mode and do not store their +// data in the profile folder on disk but only in memory. +const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; + // A boolean specifying whether the New Tab page is the home page or not. const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage"; // This is the URL of the page to load when opening new tabs. const char kHomePage[] = "homepage"; -// Maps host names to whether the host is manually allowed or blocked. -const char kSupervisedUserManualHosts[] = "profile.managed.manual_hosts"; -// Maps URLs to whether the URL is manually allowed or blocked. -const char kSupervisedUserManualURLs[] = "profile.managed.manual_urls"; - -// Stores the email address associated with the google account of the custodian -// of the supervised user, set when the supervised user is created. -const char kSupervisedUserCustodianEmail[] = "profile.managed.custodian_email"; - -// Stores the display name associated with the google account of the custodian -// of the supervised user, updated (if possible) each time the supervised user -// starts a session. -const char kSupervisedUserCustodianName[] = "profile.managed.custodian_name"; - -// Stores settings that can be modified both by a supervised user and their -// manager. See SupervisedUserSharedSettingsService for a description of -// the format. -const char kSupervisedUserSharedSettings[] = "profile.managed.shared_settings"; - // An integer that keeps track of the profile icon version. This allows us to // determine the state of the profile icon for icon format changes. const char kProfileIconVersion[] = "profile.icon_version"; @@ -85,6 +70,11 @@ const char kRestoreOnStartup[] = "session.restore_on_startup"; // higher. const char kRestoreOnStartupMigrated[] = "session.restore_on_startup_migrated"; +// Serialized migration time of kURLsToRestoreOnStartup (see +// base::Time::ToInternalValue for details on serialization format). +const char kRestoreStartupURLsMigrationTime[] = + "session.startup_urls_migration_time"; + // The URLs to restore on startup or when the home button is pressed. The URLs // are only restored on startup if kRestoreOnStartup is 4. const char kURLsToRestoreOnStartup[] = "session.startup_urls"; @@ -92,14 +82,24 @@ const char kURLsToRestoreOnStartup[] = "session.startup_urls"; // Old startup url pref name for kURLsToRestoreOnStartup. const char kURLsToRestoreOnStartupOld[] = "session.urls_to_restore_on_startup"; -// Serialized migration time of kURLsToRestoreOnStartup (see -// base::Time::ToInternalValue for details on serialization format). -const char kRestoreStartupURLsMigrationTime[] = - "session.startup_urls_migration_time"; +// Maps host names to whether the host is manually allowed or blocked. +const char kSupervisedUserManualHosts[] = "profile.managed.manual_hosts"; +// Maps URLs to whether the URL is manually allowed or blocked. +const char kSupervisedUserManualURLs[] = "profile.managed.manual_urls"; -// If set to true profiles are created in ephemeral mode and do not store their -// data in the profile folder on disk but only in memory. -const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; +// Stores the email address associated with the google account of the custodian +// of the supervised user, set when the supervised user is created. +const char kSupervisedUserCustodianEmail[] = "profile.managed.custodian_email"; + +// Stores the display name associated with the google account of the custodian +// of the supervised user, updated (if possible) each time the supervised user +// starts a session. +const char kSupervisedUserCustodianName[] = "profile.managed.custodian_name"; + +// Stores settings that can be modified both by a supervised user and their +// manager. See SupervisedUserSharedSettingsService for a description of +// the format. +const char kSupervisedUserSharedSettings[] = "profile.managed.shared_settings"; // The application locale. // For OS_CHROMEOS we maintain kApplicationLocale property in both local state diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index f8177c7..92360bb 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -24,22 +24,22 @@ namespace prefs { extern const char kDefaultApps[]; extern const char kDefaultAppsInstalled[]; extern const char kDisableScreenshots[]; +extern const char kForceEphemeralProfiles[]; extern const char kHomePageIsNewTabPage[]; extern const char kHomePage[]; -extern const char kSupervisedUserManualHosts[]; -extern const char kSupervisedUserManualURLs[]; -extern const char kSupervisedUserCustodianEmail[]; -extern const char kSupervisedUserCustodianName[]; -extern const char kSupervisedUserSharedSettings[]; extern const char kProfileIconVersion[]; extern const char kRestoreOnStartup[]; extern const char kRestoreOnStartupMigrated[]; +extern const char kRestoreStartupURLsMigrationTime[]; extern const char kSessionExitedCleanly[]; extern const char kSessionExitType[]; +extern const char kSupervisedUserManualHosts[]; +extern const char kSupervisedUserManualURLs[]; +extern const char kSupervisedUserCustodianEmail[]; +extern const char kSupervisedUserCustodianName[]; +extern const char kSupervisedUserSharedSettings[]; extern const char kURLsToRestoreOnStartup[]; extern const char kURLsToRestoreOnStartupOld[]; -extern const char kRestoreStartupURLsMigrationTime[]; -extern const char kForceEphemeralProfiles[]; // For OS_CHROMEOS we maintain kApplicationLocale property in both local state // and user's profile. Global property determines locale of login screen, diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 042910a..ba366e1 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -321,13 +321,13 @@ const char kExtensionsSubPage[] = "extensions"; const char kHandlerSettingsSubPage[] = "handlers"; const char kImportDataSubPage[] = "importData"; const char kLanguageOptionsSubPage[] = "languages"; -const char kSupervisedUserSettingsSubPage[] = "managedUser"; const char kManageProfileSubPage[] = "manageProfile"; const char kPasswordManagerSubPage[] = "passwords"; const char kResetProfileSettingsSubPage[] = "resetProfileSettings"; const char kSearchEnginesSubPage[] = "searchEngines"; const char kSearchSubPage[] = "search"; const char kSearchUsersSubPage[] = "search#Users"; +const char kSupervisedUserSettingsSubPage[] = "managedUser"; const char kSyncSetupSubPage[] = "syncSetup"; #if defined(OS_CHROMEOS) const char kInternetOptionsSubPage[] = "internet"; diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index 9373e79..8cc7aad 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -308,13 +308,13 @@ extern const char kExtensionsSubPage[]; extern const char kHandlerSettingsSubPage[]; extern const char kImportDataSubPage[]; extern const char kLanguageOptionsSubPage[]; -extern const char kSupervisedUserSettingsSubPage[]; extern const char kManageProfileSubPage[]; extern const char kPasswordManagerSubPage[]; extern const char kResetProfileSettingsSubPage[]; extern const char kSearchEnginesSubPage[]; extern const char kSearchSubPage[]; extern const char kSearchUsersSubPage[]; +extern const char kSupervisedUserSettingsSubPage[]; extern const char kSyncSetupSubPage[]; #if defined(OS_CHROMEOS) extern const char kInternetOptionsSubPage[]; 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[]; |