summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 14:53:08 +0000
committergfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 14:53:08 +0000
commitab5b32246b6fcda4cf76023c1813f1c21c45b373 (patch)
treed108eeaf245b04def063e7dc4c929185ae50c377
parentfedf50bbc538c11f5dcdf05163b64a40221f64a9 (diff)
downloadchromium_src-ab5b32246b6fcda4cf76023c1813f1c21c45b373.zip
chromium_src-ab5b32246b6fcda4cf76023c1813f1c21c45b373.tar.gz
chromium_src-ab5b32246b6fcda4cf76023c1813f1c21c45b373.tar.bz2
Revert 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) TBR=jochen Review URL: http://codereview.chromium.org/3781022 TBR=gfeher@chromium.org Review URL: http://codereview.chromium.org/4035003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63512 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_prefs.cc1
-rw-r--r--chrome/browser/policy/configuration_policy_pref_store.cc2
-rw-r--r--chrome/browser/policy/configuration_policy_store.h1
-rw-r--r--chrome/common/policy_constants.cc1
-rw-r--r--chrome/common/policy_constants.h1
-rw-r--r--chrome/common/pref_names.cc6
-rw-r--r--chrome/common/pref_names.h2
7 files changed, 0 insertions, 14 deletions
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index eb6485f..5ebae6a 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -903,6 +903,5 @@ 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 d4eac82..c496348 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -225,8 +225,6 @@ 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 73a0a4a..fb21d0e 100644
--- a/chrome/browser/policy/configuration_policy_store.h
+++ b/chrome/browser/policy/configuration_policy_store.h
@@ -48,7 +48,6 @@ class ConfigurationPolicyStore {
kPolicyApplicationLocale,
kPolicyExtensionInstallAllowList,
kPolicyExtensionInstallDenyList,
- kPolicyExtensionInstallForceList,
kPolicyShowHomeButton,
kPolicyDisabledPlugins,
kPolicyPrintingEnabled,
diff --git a/chrome/common/policy_constants.cc b/chrome/common/policy_constants.cc
index ca68a60..ffe93b4 100644
--- a/chrome/common/policy_constants.cc
+++ b/chrome/common/policy_constants.cc
@@ -50,7 +50,6 @@ 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 d0ce5c4..cebf36b 100644
--- a/chrome/common/policy_constants.h
+++ b/chrome/common/policy_constants.h
@@ -47,7 +47,6 @@ 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 c6c0c6e..a26a4d8 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -897,12 +897,6 @@ 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 cde75fb..52adbc36 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -326,8 +326,6 @@ extern const char kNextExtensionsUpdateCheck[];
extern const char kExtensionInstallAllowList[];
extern const char kExtensionInstallDenyList[];
-extern const char kExtensionInstallForceList[];
-
extern const char kExtensionBlacklistUpdateVersion[];
extern const char kExtensionSidebarWidth[];