diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/resources/options/advanced_options.html | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/resources/options/advanced_options.html')
| -rw-r--r-- | chrome/browser/resources/options/advanced_options.html | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html index f6b94ea..c317349 100644 --- a/chrome/browser/resources/options/advanced_options.html +++ b/chrome/browser/resources/options/advanced_options.html @@ -10,7 +10,7 @@ i18n-content="privacyClearDataButton"></button> </div> <div i18n-content="disableServices" class="disable-services-div"></div> - <div><a target="_blank" i18n-content="privacyLearnMoreLabel" + <div><a target="_blank" i18n-content="learnMore" i18n-values="href:privacyLearnMoreURL"></a></div> <label class="checkbox"> <input id="alternateErrorPagesEnabled" pref="alternate_error_pages.enabled" @@ -33,8 +33,8 @@ <span i18n-content="safeBrowsingEnableProtection"></span> </label> <if expr="pp_ifdef('_google_chrome')"> - <label class="checkbox"> - <input id="metricsReportingEnabled" + <label class="checkbox" id="metricsReportingSetting"> + <input id="metricsReportingEnabled" pref="cros.metrics.reportingEnabled" type="checkbox"> <span i18n-content="enableLogging"></span> </label> @@ -92,6 +92,23 @@ </if> <div><button id="fontSettingsConfigureFontsOnlyButton" i18n-content="fontSettingsConfigureFontsOnlyButton"></button></div> + <div> + <label style="display:inline;"> + <span i18n-content="defaultZoomLevelLabel"></span> + <select id="defaultZoomLevel"> + <option value="-3">57%</option> + <option value="-2">69%</option> + <option value="-1">83%</option> + <option value="0">100%</option> + <option value="1">120%</option> + <option value="2">144%</option> + <option value="3">172%</option> + <option value="4">207%</option> + <option value="5">248%</option> + <option value="6">298%</option> + </select> + </label> + </div> <if expr="os == 'win32'"> <div> <label style="display:inline;"> @@ -163,7 +180,7 @@ </label> <div> <a target="_blank" - i18n-content="chromeAppsLearnMoreBackgroundModeLabel" + i18n-content="learnMore" i18n-values="href:chromeAppsLearnMoreBackgroundModeURL"></a> </div> </div> |