summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 05:35:06 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 05:35:06 +0000
commit27b3fe9a7f1f559e1fb66c9a9b7dc7f20015eb2d (patch)
treec4dfba4defa2ee99772bd9e0b836bb097ab3674a /chrome
parent27f6af6d0acc3fb17eb46b9b6e237d6468467d8a (diff)
downloadchromium_src-27b3fe9a7f1f559e1fb66c9a9b7dc7f20015eb2d.zip
chromium_src-27b3fe9a7f1f559e1fb66c9a9b7dc7f20015eb2d.tar.gz
chromium_src-27b3fe9a7f1f559e1fb66c9a9b7dc7f20015eb2d.tar.bz2
[net/dns] Adds --enable-async-dns to about:flags.
R=cbentzel@chromium.org TEST=Enable "Asynchronous DNS" in chrome://flags. Check chrome://net-internals/#events Review URL: http://codereview.chromium.org/9772001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/browser/about_flags.cc9
2 files changed, 14 insertions, 1 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 45f2519..eb79bac 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5106,6 +5106,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ENABLE_HTTP_PIPELINING_DESCRIPTION" desc="Description for the flag to enable HTTP pipelining.">
Enable experimental pipelining of HTTP requests.
</message>
+ <message name="IDS_FLAGS_ENABLE_ASYNC_DNS_NAME" desc="Title for the flag to enable asynchronous DNS client.">
+ Built-in Asynchronous DNS
+ </message>
+ <message name="IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION" desc="Description for the flag to enable asynchronous DNS client.">
+ Enable experimental asynchronous DNS client.
+ </message>
<message name="IDS_FLAGS_ENABLE_VIDEO_TRACK_NAME" desc="Title for the flag to enable the &lt;track&gt; element for &lt;video&gt; elements.">
Enable <ph name="TRACK_HTML">&lt;track&gt;</ph> element
</message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 281c3f3..2f17539 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -433,6 +433,13 @@ const Experiment kExperiments[] = {
SINGLE_VALUE_TYPE(switches::kEnableHttpPipelining)
},
{
+ "enable-async-dns",
+ IDS_FLAGS_ENABLE_ASYNC_DNS_NAME,
+ IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION,
+ kOsAll,
+ SINGLE_VALUE_TYPE(switches::kEnableAsyncDns)
+ },
+ {
"enable-video-track",
IDS_FLAGS_ENABLE_VIDEO_TRACK_NAME,
IDS_FLAGS_ENABLE_VIDEO_TRACK_DESCRIPTION,
@@ -443,7 +450,7 @@ const Experiment kExperiments[] = {
"enable-media-source",
IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME,
IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION,
- kOsAll,
+ kOsWin | kOsMac | kOsLinux | kOsCrOS,
SINGLE_VALUE_TYPE(switches::kEnableMediaSource)
},
{