summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/chromeos_strings.grdp2
-rw-r--r--chrome/browser/resources/options/chromeos/internet_detail.css2
-rw-r--r--chrome/browser/resources/options/chromeos/internet_detail.html2
-rw-r--r--chrome/browser/resources/options/chromeos/internet_detail.js3
4 files changed, 6 insertions, 3 deletions
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
index c242edb..6d43240 100644
--- a/chrome/app/chromeos_strings.grdp
+++ b/chrome/app/chromeos_strings.grdp
@@ -1208,7 +1208,7 @@ Press any key to continue exploring.
Automatic name servers
</message>
<message name="IDS_OPTIONS_SETTINGS_INTERNET_GOOGLE_NAME_SERVERS" desc="In the name server type radio for static ip configuration, labels the Google DNS selection.">
- Google name servers
+ Google name servers - <ph name="BEGIN_LINK">&lt;a href="https://developers.google.com/speed/public-dns" target="_blank"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
</message>
<message name="IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVERS" desc="In the name server type radio for static ip configuration, labels the user DNS selection.">
Custom name servers
diff --git a/chrome/browser/resources/options/chromeos/internet_detail.css b/chrome/browser/resources/options/chromeos/internet_detail.css
index 3fef184..7954f6e 100644
--- a/chrome/browser/resources/options/chromeos/internet_detail.css
+++ b/chrome/browser/resources/options/chromeos/internet_detail.css
@@ -31,7 +31,7 @@
-webkit-box-flex: 1;
-webkit-box-sizing: border-box;
-webkit-padding-end: 10px;
- height: 380px;
+ height: 390px;
min-width: 480px;
overflow-y: auto;
}
diff --git a/chrome/browser/resources/options/chromeos/internet_detail.html b/chrome/browser/resources/options/chromeos/internet_detail.html
index 8c90aba..f157400 100644
--- a/chrome/browser/resources/options/chromeos/internet_detail.html
+++ b/chrome/browser/resources/options/chromeos/internet_detail.html
@@ -466,7 +466,7 @@
<label>
<input id="google-dns-radio" type="radio" name="dnstype"
value="google">
- <span i18n-content="googleNameServers"></span>
+ <span id="google-dns-label"></span>
</label>
</div>
<div id="google-dns-display" class="dns-display"></div>
diff --git a/chrome/browser/resources/options/chromeos/internet_detail.js b/chrome/browser/resources/options/chromeos/internet_detail.js
index 7a1de94..84262c9 100644
--- a/chrome/browser/resources/options/chromeos/internet_detail.js
+++ b/chrome/browser/resources/options/chromeos/internet_detail.js
@@ -275,6 +275,9 @@ cr.define('options.internet', function() {
this.handleNameServerTypeChange_);
$('user-dns-radio').addEventListener('click',
this.handleNameServerTypeChange_);
+
+ $('google-dns-label').innerHTML =
+ loadTimeData.getString('googleNameServers');
},
/**