diff options
author | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-25 08:48:55 +0000 |
---|---|---|
committer | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-25 08:48:55 +0000 |
commit | 5b727868ffda8fa6c639562adedca5470ebb33ca (patch) | |
tree | 1466071afd97a243a6e54075ea4457eaeab9310f /chrome | |
parent | 764838204b6cb2cb54a0ee961461a8f388694162 (diff) | |
download | chromium_src-5b727868ffda8fa6c639562adedca5470ebb33ca.zip chromium_src-5b727868ffda8fa6c639562adedca5470ebb33ca.tar.gz chromium_src-5b727868ffda8fa6c639562adedca5470ebb33ca.tar.bz2 |
Reland 63509 - Define constants for the 'silent extension' install policy
This policy and preference will hold the list of extensions that should be
silently installed.
BUG=59782
TEST=none (real logic comes in later CLs)
Review URL: http://codereview.chromium.org/4014007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/extensions/extension_prefs.cc | 1 | ||||
-rw-r--r-- | chrome/browser/policy/configuration_policy_pref_store.cc | 2 | ||||
-rw-r--r-- | chrome/browser/policy/configuration_policy_store.h | 1 | ||||
-rw-r--r-- | chrome/common/policy_constants.cc | 1 | ||||
-rw-r--r-- | chrome/common/policy_constants.h | 1 | ||||
-rw-r--r-- | chrome/common/pref_names.cc | 6 | ||||
-rw-r--r-- | chrome/common/pref_names.h | 2 |
7 files changed, 14 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index 5ebae6a..eb6485f 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -903,5 +903,6 @@ void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) { prefs->RegisterDictionaryPref(kExtensionsBlacklistUpdate); prefs->RegisterListPref(prefs::kExtensionInstallAllowList); prefs->RegisterListPref(prefs::kExtensionInstallDenyList); + prefs->RegisterDictionaryPref(prefs::kExtensionInstallForceList); prefs->RegisterStringPref(kWebStoreLogin, std::string() /* default_value */); } diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index 8ebd74c..cef80e3 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -227,6 +227,8 @@ ConfigurationPolicyPrefStore::GetChromePolicyValueMap() { Value::TYPE_LIST, key::kExtensionInstallAllowList }, { ConfigurationPolicyStore::kPolicyExtensionInstallDenyList, Value::TYPE_LIST, key::kExtensionInstallDenyList }, + { ConfigurationPolicyStore::kPolicyExtensionInstallForceList, + Value::TYPE_LIST, key::kExtensionInstallForceList }, { ConfigurationPolicyStore::kPolicyShowHomeButton, Value::TYPE_BOOLEAN, key::kShowHomeButton }, { ConfigurationPolicyStore::kPolicyPrintingEnabled, diff --git a/chrome/browser/policy/configuration_policy_store.h b/chrome/browser/policy/configuration_policy_store.h index d4a64d2..ca768a8 100644 --- a/chrome/browser/policy/configuration_policy_store.h +++ b/chrome/browser/policy/configuration_policy_store.h @@ -48,6 +48,7 @@ class ConfigurationPolicyStore { kPolicyApplicationLocale, kPolicyExtensionInstallAllowList, kPolicyExtensionInstallDenyList, + kPolicyExtensionInstallForceList, kPolicyShowHomeButton, kPolicyDisabledPlugins, kPolicyPrintingEnabled, diff --git a/chrome/common/policy_constants.cc b/chrome/common/policy_constants.cc index 5d141d9..5334bb1 100644 --- a/chrome/common/policy_constants.cc +++ b/chrome/common/policy_constants.cc @@ -50,6 +50,7 @@ const char kApplicationLocaleValue[] = "ApplicationLocaleValue"; const char kSyncDisabled[] = "SyncDisabled"; const char kExtensionInstallAllowList[] = "ExtensionInstallWhitelist"; const char kExtensionInstallDenyList[] = "ExtensionInstallBlacklist"; +const char kExtensionInstallForceList[] = "ExtensionInstallForcelist"; const char kShowHomeButton[] = "ShowHomeButton"; const char kPrintingEnabled[] = "PrintingEnabled"; const char kJavascriptEnabled[] = "JavascriptEnabled"; diff --git a/chrome/common/policy_constants.h b/chrome/common/policy_constants.h index 93daa21..48cf011 100644 --- a/chrome/common/policy_constants.h +++ b/chrome/common/policy_constants.h @@ -47,6 +47,7 @@ extern const char kApplicationLocaleValue[]; extern const char kSyncDisabled[]; extern const char kExtensionInstallAllowList[]; extern const char kExtensionInstallDenyList[]; +extern const char kExtensionInstallForceList[]; extern const char kShowHomeButton[]; extern const char kPrintingEnabled[]; extern const char kJavascriptEnabled[]; diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index 59505fd..32a5ef3 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -900,6 +900,12 @@ const char kExtensionInstallAllowList[] = "extensions.install.allowlist"; // Google controlled. const char kExtensionInstallDenyList[] = "extensions.install.denylist"; +// A dictionary containing extensions that Chrome will silently install +// at startup time. Its format and semantis are the same as +// external_extensions.json. This preference is meant to be controlled +// by the administrator. +const char kExtensionInstallForceList[] = "extensions.install.forcelist"; + // Time of the last, and next scheduled, extensions auto-update checks. const char kLastExtensionsUpdateCheck[] = "extensions.autoupdate.last_check"; const char kNextExtensionsUpdateCheck[] = "extensions.autoupdate.next_check"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 16ae6be..2a5d6c3 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -327,6 +327,8 @@ extern const char kNextExtensionsUpdateCheck[]; extern const char kExtensionInstallAllowList[]; extern const char kExtensionInstallDenyList[]; +extern const char kExtensionInstallForceList[]; + extern const char kExtensionBlacklistUpdateVersion[]; extern const char kExtensionSidebarWidth[]; |