summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiguelg <miguelg@chromium.org>2015-05-15 00:49:28 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-15 07:49:37 +0000
commit547154b809f5d920503832f661d02c627df2303d (patch)
tree433b70b999340f681e8c6f0adcc5bcb1a3eb5771
parent4ec8c14511d3cdfab9d1cbb085faf6901866e05f (diff)
downloadchromium_src-547154b809f5d920503832f661d02c627df2303d.zip
chromium_src-547154b809f5d920503832f661d02c627df2303d.tar.gz
chromium_src-547154b809f5d920503832f661d02c627df2303d.tar.bz2
Remove the obsolete HasPermission switch
BUG=479246 Review URL: https://codereview.chromium.org/1129293007 Cr-Commit-Position: refs/heads/master@{#330059}
-rw-r--r--chrome/browser/push_messaging/push_messaging_browsertest.cc1
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc1
-rw-r--r--content/child/runtime_features.cc3
-rw-r--r--content/public/common/content_switches.cc4
-rw-r--r--content/public/common/content_switches.h1
5 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc
index 736cfbd..b03f082 100644
--- a/chrome/browser/push_messaging/push_messaging_browsertest.cc
+++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc
@@ -77,7 +77,6 @@ class PushMessagingBrowserTest : public InProcessBrowserTest {
// InProcessBrowserTest:
void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kEnablePushMessagePayload);
- command_line->AppendSwitch(switches::kEnablePushMessagingHasPermission);
InProcessBrowserTest::SetUpCommandLine(command_line);
}
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index f10d0c1..14006ce 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1270,7 +1270,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
switches::kEnablePreciseMemoryInfo,
switches::kEnablePreferCompositingToLCDText,
switches::kEnablePushMessagePayload,
- switches::kEnablePushMessagingHasPermission,
switches::kEnableRendererMojoChannel,
switches::kEnableSeccompFilterSandbox,
switches::kEnableSkiaBenchmarking,
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index c7a38b4..caa1335 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -188,9 +188,6 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
if (command_line.HasSwitch(switches::kEnablePushMessagePayload))
WebRuntimeFeatures::enablePushMessagingData(true);
- if (command_line.HasSwitch(switches::kEnablePushMessagingHasPermission))
- WebRuntimeFeatures::enablePushMessagingHasPermission(true);
-
// Delete "StaleWhileRevalidate" line from chrome_browser_field_trials.cc
// when this experiment is done.
if (base::FieldTrialList::FindFullName("StaleWhileRevalidate") == "Enabled" ||
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 67784cf..e31b91a 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -391,10 +391,6 @@ const char kEnablePreciseMemoryInfo[] = "enable-precise-memory-info";
// Enables payloads for received push messages when using the W3C Push API.
const char kEnablePushMessagePayload[] = "enable-push-message-payload";
-// Enable hasPermission() method of the W3C Push API.
-const char kEnablePushMessagingHasPermission[] =
- "enable-push-messaging-has-permission";
-
// Set options to cache V8 data. (off, preparse data, or code)
const char kV8CacheOptions[] = "v8-cache-options";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index dd82d78..a84daf3 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -121,7 +121,6 @@ CONTENT_EXPORT extern const char kEnablePinch[];
CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
CONTENT_EXPORT extern const char kEnablePreciseMemoryInfo[];
CONTENT_EXPORT extern const char kEnablePushMessagePayload[];
-CONTENT_EXPORT extern const char kEnablePushMessagingHasPermission[];
CONTENT_EXPORT extern const char kEnableRegionBasedColumns[];
CONTENT_EXPORT extern const char kEnableSandboxLogging[];
CONTENT_EXPORT extern const char kEnableSeccompFilterSandbox[];