summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorniklase@chromium.org <niklase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 09:11:14 +0000
committerniklase@chromium.org <niklase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 09:11:14 +0000
commit15a5d722c332d156f64f9f20a1da6710845b6e06 (patch)
tree758d77ebefe58347219207c8880f71762ce18047
parent339c64e58176d81e43766785d05d3124a9a8fa31 (diff)
downloadchromium_src-15a5d722c332d156f64f9f20a1da6710845b6e06.zip
chromium_src-15a5d722c332d156f64f9f20a1da6710845b6e06.tar.gz
chromium_src-15a5d722c332d156f64f9f20a1da6710845b6e06.tar.bz2
about:flags for --enable-media-stream. Unlocks MediaStream, GetUserMedia, PeerConnection APIs for WebRTC usage.
Review URL: https://chromiumcodereview.appspot.com/9176007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118664 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd8
-rw-r--r--chrome/browser/about_flags.cc7
2 files changed, 13 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 81f9ca1..704de00 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5047,8 +5047,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION" desc="Description for the flag to disable using a software renderer.">
Don't fall back to a 3D software rasterizer when the GPU cannot be used.
</message>
-
-
+ <message name="IDS_FLAGS_MEDIA_STREAM_NAME" desc="Name for the flag to enable MediaStream, GetUserMedia and PeerConnection.">
+ Enable MediaStream.
+ </message>
+ <message name="IDS_FLAGS_MEDIA_STREAM_DESCRIPTION" desc="Description for the flag to enable MediaStream, GetUserMedia and PeerConnection.">
+ Enable MediaStream, GetUserMedia, and PeerConnection APIs for WebRTC functionality. More info at webrtc.org.
+ </message>
<!-- Crashes -->
<message name="IDS_CRASHES_TITLE" desc="Title for the chrome://crashes page.">
Crashes
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index d3fe09a..ec4a57f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -541,6 +541,13 @@ const Experiment kExperiments[] = {
#endif
SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer)
},
+ {
+ "enable-media-stream",
+ IDS_FLAGS_MEDIA_STREAM_NAME,
+ IDS_FLAGS_MEDIA_STREAM_DESCRIPTION,
+ kOsWin | kOsLinux | kOsMac,
+ SINGLE_VALUE_TYPE(switches::kEnableMediaStream)
+ },
};
const Experiment* experiments = kExperiments;