diff options
| -rw-r--r-- | build/ios/grit_whitelist.txt | 2 | ||||
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index 484f806..f897b206 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -514,6 +514,8 @@ IDS_FLAGS_DISABLE_WEBRTC_NAME IDS_FLAGS_ENABLE IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_NAME +IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION +IDS_FLAGS_ENABLE_ASYNC_DNS_NAME IDS_FLAGS_ENABLE_CARRIER_SWITCHING IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION IDS_FLAGS_ENABLE_CONTEXTUAL_SEARCH diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e2c1707..e6db949 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6121,6 +6121,12 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_ENABLE_SPDY4_DESCRIPTION" desc="Description for the flag to enable SPDY/4."> Enable SPDY/4, which is the HTTP/2 standard. Currently experimental. </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_DISABLE_MEDIA_SOURCE_NAME" desc="Title for the flag to disable the Media Source API."> Disable Media Source API. </message> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index c787e216..8321571 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -678,6 +678,14 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(switches::kEnableSpdy4) }, { + "enable-async-dns", + IDS_FLAGS_ENABLE_ASYNC_DNS_NAME, + IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION, + kOsWin | kOsMac | kOsLinux | kOsCrOS, + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns, + switches::kDisableAsyncDns) + }, + { "disable-media-source", IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, |