| Index: chrome/common/pref_names.cc
|
| diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
|
| index 3eaabc2e7251aa48679129ce7f29666ad1bc2bf4..3598c92baf8116a1268ffe182bb5edb4219f9ae4 100644
|
| --- a/chrome/common/pref_names.cc
|
| +++ b/chrome/common/pref_names.cc
|
| @@ -21,6 +21,11 @@ const char kDefaultApps[] = "default_apps";
|
| // Whether we have installed default apps yet in this profile.
|
| const char kDefaultAppsInstalled[] = "default_apps_installed";
|
|
|
| +// Disables screenshot accelerators and extension APIs.
|
| +// This setting resides both in profile prefs and local state. Accelerator
|
| +// handling code reads local state, while extension APIs use profile pref.
|
| +const char kDisableScreenshots[] = "disable_screenshots";
|
| +
|
| // A boolean specifying whether the New Tab page is the home page or not.
|
| const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage";
|
|
|
| @@ -30,6 +35,13 @@ const char kHomePage[] = "homepage";
|
| // Did the user change the home page after install?
|
| const char kHomePageChanged[] = "homepage_changed";
|
|
|
| +// This preference is used to store the hash of a password of the custodian of
|
| +// a managed user. It allows to unlock options which should be not available to
|
| +// the managed user. The salt preference is used to derive the hash from the
|
| +// password.
|
| +const char kManagedModeLocalPassphrase[] = "managed_mode.passphrase";
|
| +const char kManagedModeLocalSalt[] = "managed_mode.salt";
|
| +
|
| // Maps host names to whether the host is manually allowed or blocked.
|
| const char kManagedModeManualHosts[] = "profile.managed.manual_hosts";
|
| // Maps URLs to whether the URL is manually allowed or blocked.
|
| @@ -68,11 +80,6 @@ const char kURLsToRestoreOnStartup[] = "session.urls_to_restore_on_startup";
|
| // higher.
|
| const char kRestoreOnStartupMigrated[] = "session.restore_on_startup_migrated";
|
|
|
| -// Disables screenshot accelerators and extension APIs.
|
| -// This setting resides both in profile prefs and local state. Accelerator
|
| -// handling code reads local state, while extension APIs use profile pref.
|
| -const char kDisableScreenshots[] = "disable_screenshots";
|
| -
|
| // The application locale.
|
| // For OS_CHROMEOS we maintain kApplicationLocale property in both local state
|
| // and user's profile. Global property determines locale of login screen,
|
|
|