summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 03:47:15 +0000
committersdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 03:47:15 +0000
commitb27e085cb6c5e5029528e7196f6aab0a51ed1225 (patch)
tree2dbbe127fd61854d40f264422b3a33a7adefd2cc
parent29880fba5d1f20c882df750db3593234e165159c (diff)
downloadchromium_src-b27e085cb6c5e5029528e7196f6aab0a51ed1225.zip
chromium_src-b27e085cb6c5e5029528e7196f6aab0a51ed1225.tar.gz
chromium_src-b27e085cb6c5e5029528e7196f6aab0a51ed1225.tar.bz2
Cleanup: Remove the allow-scripting-gallery flag and associated functionality, as part of the flag removal effort. This functionality is no longer being used.
BUG=355677 Review URL: https://codereview.chromium.org/206553003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259136 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chrome_content_browser_client.cc1
-rw-r--r--chrome/common/extensions/chrome_extensions_client.cc4
-rw-r--r--chrome/renderer/extensions/renderer_permissions_policy_delegate.cc3
-rw-r--r--extensions/common/switches.cc5
-rw-r--r--extensions/common/switches.h1
5 files changed, 1 insertions, 13 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 182af74..293df39 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1558,7 +1558,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
autofill::switches::kLocalHeuristicsOnlyForPasswordGeneration,
extensions::switches::kAllowHTTPBackgroundPage,
extensions::switches::kAllowLegacyExtensionManifests,
- extensions::switches::kAllowScriptingGallery,
extensions::switches::kEnableExperimentalExtensionApis,
extensions::switches::kExtensionsOnChromeURLs,
// TODO(victorhsieh): remove the following flag once we move PPAPI FileIO
diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
index c9b7c19..5d82845 100644
--- a/chrome/common/extensions/chrome_extensions_client.cc
+++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -144,10 +144,6 @@ bool ChromeExtensionsClient::IsScriptableURL(
// TODO(erikkay): This seems like the wrong test. Shouldn't we we testing
// against the store app extent?
GURL store_url(extension_urls::GetWebstoreLaunchURL());
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kAllowScriptingGallery)) {
- return true;
- }
if (url.host() == store_url.host()) {
if (error)
*error = manifest_errors::kCannotScriptGallery;
diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc b/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
index 73a1c73..2774064 100644
--- a/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
+++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
@@ -46,8 +46,7 @@ bool RendererPermissionsPolicyDelegate::CanExecuteScriptOnPage(
return false;
}
- if (dispatcher_->IsExtensionActive(extension_misc::kWebStoreAppId) &&
- !command_line->HasSwitch(switches::kAllowScriptingGallery)) {
+ if (dispatcher_->IsExtensionActive(extension_misc::kWebStoreAppId)) {
if (error)
*error = errors::kCannotScriptGallery;
return false;
diff --git a/extensions/common/switches.cc b/extensions/common/switches.cc
index b709630..64b9af5 100644
--- a/extensions/common/switches.cc
+++ b/extensions/common/switches.cc
@@ -16,11 +16,6 @@ const char kAllowHTTPBackgroundPage[] = "allow-http-background-page";
const char kAllowLegacyExtensionManifests[] =
"allow-legacy-extension-manifests";
-// Allows injecting extensions and user scripts on the extensions gallery
-// site. Normally prevented for security reasons, but can be useful for
-// automation testing of the gallery.
-const char kAllowScriptingGallery[] = "allow-scripting-gallery";
-
// Enables extensions to be easily installed from sites other than the web
// store. Without this flag, they can still be installed, but must be manually
// dragged onto chrome://extensions/.
diff --git a/extensions/common/switches.h b/extensions/common/switches.h
index 64f8189..ba1e131 100644
--- a/extensions/common/switches.h
+++ b/extensions/common/switches.h
@@ -13,7 +13,6 @@ namespace switches {
extern const char kAllowHTTPBackgroundPage[];
extern const char kAllowLegacyExtensionManifests[];
-extern const char kAllowScriptingGallery[];
extern const char kEasyOffStoreExtensionInstall[];
extern const char kEnableExperimentalExtensionApis[];
extern const char kEnableOverrideBookmarksUI[];