summaryrefslogtreecommitdiffstats
path: root/content/public
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-14 15:44:26 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-14 15:44:26 +0000
commitb18b89f3601ee18ffc02e768dec12febc159e8d2 (patch)
treecfcaa73741ce6699141b2f9b2ce1b3f011a82895 /content/public
parent42cf6c6fface29b49fe2ae319e1afacf461793c8 (diff)
downloadchromium_src-b18b89f3601ee18ffc02e768dec12febc159e8d2.zip
chromium_src-b18b89f3601ee18ffc02e768dec12febc159e8d2.tar.gz
chromium_src-b18b89f3601ee18ffc02e768dec12febc159e8d2.tar.bz2
Landing patch from issue 11533004
(https://codereview.chromium.org/11533004/) Original description: Add a flag that controls if RTCDataChannels can be created or not; as well as basic usage of it. BUG=165426 Review URL: https://codereview.chromium.org/11570025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
-rw-r--r--content/public/common/content_switches.cc3
-rw-r--r--content/public/common/content_switches.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index b551191..0b4f74c 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -260,6 +260,9 @@ const char kEnableCompositingForFixedPosition[] =
// Enables CSS3 custom filters
const char kEnableCssShaders[] = "enable-css-shaders";
+// Enables RTCPeerConnection data channels
+const char kEnableDataChannels[] = "enable-data-channels";
+
// Enables device motion events.
const char kEnableDeviceMotion[] = "enable-device-motion";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 671238d..a4e059f 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -94,6 +94,7 @@ CONTENT_EXPORT extern const char kEnableBrowserPluginCompositing[];
CONTENT_EXPORT extern const char kEnableBrowserPluginForAllViewTypes[];
CONTENT_EXPORT extern const char kEnableCompositingForFixedPosition[];
CONTENT_EXPORT extern const char kEnableCssShaders[];
+CONTENT_EXPORT extern const char kEnableDataChannels[];
CONTENT_EXPORT extern const char kEnableDeviceMotion[];
CONTENT_EXPORT extern const char kEnableExperimentalWebKitFeatures[];
extern const char kEnableFastback[];