summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/browser/about_flags.cc7
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc2
-rw-r--r--chrome/common/chrome_switches.cc3
-rw-r--r--chrome/common/chrome_switches.h1
-rw-r--r--chrome/common/render_messages.cc2
-rw-r--r--chrome/renderer/render_thread.cc5
7 files changed, 0 insertions, 26 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 77974ee..2d266fc 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4009,12 +4009,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION" desc="Description of the 'GPU Accelerated Canvas 2D' lab.">
Enables higher performance of canvas tags with a 2D context by rendering using Graphics Processor Unit (GPU) hardware.
</message>
- <message name="IDS_FLAGS_WEBAUDIO_NAME" desc="Name of the 'Web Audio' lab.">
- Web Audio
- </message>
- <message name="IDS_FLAGS_WEBAUDIO_DESCRIPTION" desc="Description of the 'Web Audio' lab.">
- Enables the Web Audio API.
- </message>
<message name="IDS_FLAGS_WEBGL_NAME" desc="Name of the 'WebGL' lab.">
WebGL
</message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 02ce05d..c48dbe4 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -272,13 +272,6 @@ const Experiment kExperiments[] = {
SINGLE_VALUE_TYPE(switches::kBlockReadingThirdPartyCookies)
},
{
- "webaudio",
- IDS_FLAGS_WEBAUDIO_NAME,
- IDS_FLAGS_WEBAUDIO_DESCRIPTION,
- kOsMac, // TODO(crogers): add windows and linux when FFT is ready.
- SINGLE_VALUE_TYPE(switches::kEnableWebAudio)
- },
- {
"disable-interactive-form-validation",
IDS_FLAGS_DISABLE_INTERACTIVE_FORM_VALIDATION_NAME,
IDS_FLAGS_DISABLE_INTERACTIVE_FORM_VALIDATION_DESCRIPTION,
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 1b95254..606afa7 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -273,8 +273,6 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
!command_line.HasSwitch(switches::kDisableLocalStorage);
web_prefs.databases_enabled =
!command_line.HasSwitch(switches::kDisableDatabases);
- web_prefs.webaudio_enabled =
- command_line.HasSwitch(switches::kEnableWebAudio);
web_prefs.experimental_webgl_enabled =
gpu_enabled() &&
!command_line.HasSwitch(switches::kDisable3DAPIs) &&
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 5f8fbfd..f781baf 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -613,9 +613,6 @@ const char kEnableVideoLogging[] = "enable-video-logging";
// Order of the listed sub-arguments does not matter.
const char kEnableWatchdog[] = "enable-watchdog";
-// Enable web audio API.
-const char kEnableWebAudio[] = "enable-webaudio";
-
// Disable WebKit's XSSAuditor. The XSSAuditor mitigates reflective XSS.
const char kEnableXSSAuditor[] = "enable-xss-auditor";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 983a8a7..aa9c42d 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -182,7 +182,6 @@ extern const char kEnableVerticalTabs[];
extern const char kEnableVideoFullscreen[];
extern const char kEnableVideoLogging[];
extern const char kEnableWatchdog[];
-extern const char kEnableWebAudio[];
extern const char kEnableXSSAuditor[];
// Experimental features.
extern const char kExperimentalLocationFeatures[];
diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
index a49ea2e..eaf1504 100644
--- a/chrome/common/render_messages.cc
+++ b/chrome/common/render_messages.cc
@@ -723,7 +723,6 @@ void ParamTraits<WebPreferences>::Write(Message* m, const param_type& p) {
WriteParam(m, p.frame_flattening_enabled);
WriteParam(m, p.allow_universal_access_from_file_urls);
WriteParam(m, p.allow_file_access_from_file_urls);
- WriteParam(m, p.webaudio_enabled);
WriteParam(m, p.experimental_webgl_enabled);
WriteParam(m, p.show_composited_layer_borders);
WriteParam(m, p.accelerated_compositing_enabled);
@@ -778,7 +777,6 @@ bool ParamTraits<WebPreferences>::Read(const Message* m, void** iter,
ReadParam(m, iter, &p->frame_flattening_enabled) &&
ReadParam(m, iter, &p->allow_universal_access_from_file_urls) &&
ReadParam(m, iter, &p->allow_file_access_from_file_urls) &&
- ReadParam(m, iter, &p->webaudio_enabled) &&
ReadParam(m, iter, &p->experimental_webgl_enabled) &&
ReadParam(m, iter, &p->show_composited_layer_borders) &&
ReadParam(m, iter, &p->accelerated_compositing_enabled) &&
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index cb78d4f..92110a5 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -937,11 +937,6 @@ void RenderThread::EnsureWebKitInitialized() {
WebRuntimeFeatures::enableGeolocation(
!command_line.HasSwitch(switches::kDisableGeolocation));
-#ifdef HAS_WEBAUDIO_RUNTIMEFEATURES
- WebRuntimeFeatures::enableWebAudio(
- command_line.HasSwitch(switches::kEnableWebAudio));
-#endif
-
WebRuntimeFeatures::enableWebGL(
!command_line.HasSwitch(switches::kDisable3DAPIs) &&
!command_line.HasSwitch(switches::kDisableExperimentalWebGL));