diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 23:32:28 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 23:32:28 +0000 |
| commit | 234fc5ff000fc423b8b98859474c9ee77e09a3f2 (patch) | |
| tree | 984053b1f24a7481d208be86f808cda22a7b8aa0 /chrome/browser/extensions/install_verifier.cc | |
| parent | 95734dc8aa8861962b878d92389baedf47cd5091 (diff) | |
| download | chromium_src-234fc5ff000fc423b8b98859474c9ee77e09a3f2.zip chromium_src-234fc5ff000fc423b8b98859474c9ee77e09a3f2.tar.gz chromium_src-234fc5ff000fc423b8b98859474c9ee77e09a3f2.tar.bz2 | |
extensions: Relocate pref name constants.
Move extension-related pref name constants used by the
ExtensionPrefs class from chrome/common/pref_names.h to
extensions/browser/pref_names.h. Remove "Extension" from the
beginning of the constant identifiers and "Pref" from the
end since it seemed redundant now that they're in the
extensions::pref_names namespace.
Also delete prefs::kExtensionBlacklistUpdateVersion since it
hasn't been used in about a year.
BUG=313284
TBR=isherman@chromium.org,sky@chromium.org
Review URL: https://codereview.chromium.org/140343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/install_verifier.cc')
| -rw-r--r-- | chrome/browser/extensions/install_verifier.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/install_verifier.cc b/chrome/browser/extensions/install_verifier.cc index c0b862b..752ab20 100644 --- a/chrome/browser/extensions/install_verifier.cc +++ b/chrome/browser/extensions/install_verifier.cc @@ -19,6 +19,7 @@ #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "content/public/common/content_switches.h" +#include "extensions/browser/pref_names.h" #include "extensions/common/manifest.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -349,16 +350,16 @@ void InstallVerifier::GarbageCollect() { bool InstallVerifier::AllowedByEnterprisePolicy(const std::string& id) const { PrefService* pref_service = prefs_->pref_service(); - if (pref_service->IsManagedPreference(prefs::kExtensionInstallAllowList)) { + if (pref_service->IsManagedPreference(pref_names::kInstallAllowList)) { const base::ListValue* whitelist = - pref_service->GetList(prefs::kExtensionInstallAllowList); + pref_service->GetList(pref_names::kInstallAllowList); base::StringValue id_value(id); if (whitelist && whitelist->Find(id_value) != whitelist->end()) return true; } - if (pref_service->IsManagedPreference(prefs::kExtensionInstallForceList)) { + if (pref_service->IsManagedPreference(pref_names::kInstallForceList)) { const base::DictionaryValue* forcelist = - pref_service->GetDictionary(prefs::kExtensionInstallForceList); + pref_service->GetDictionary(pref_names::kInstallForceList); if (forcelist && forcelist->HasKey(id)) return true; } |