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/browser_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/browser_options.html')
| -rw-r--r-- | chrome/browser/resources/options/browser_options.html | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html index 7950913..ec1a30b 100644 --- a/chrome/browser/resources/options/browser_options.html +++ b/chrome/browser/resources/options/browser_options.html @@ -64,13 +64,30 @@ </section> <section> <h3 i18n-content="defaultSearchGroupName"></h3> - <div id="defaultSearchEngineGroup"> - <select id="defaultSearchEngine" - onchange="BrowserOptions.getInstance().setDefaultSearchEngine()"> - </select> - <button id="defaultSearchManageEnginesButton" - i18n-content="defaultSearchManageEnginesLink"></button> - </div> + <div id="defaultSearchEngineGroup"> + <div> + <select id="defaultSearchEngine" + onchange="BrowserOptions.getInstance().setDefaultSearchEngine()"> + </select> + <button id="defaultSearchManageEnginesButton" + i18n-content="defaultSearchManageEnginesLink"></button> + </div> + <label class="checkbox" id="instantOption"> + <!-- TODO(estade): metric? --> + <input type="checkbox" id="instantEnableCheckbox" + pref="instant.enabled"> + <span i18n-content="instantName"></span> + <!-- This hidden checkbox allows us to get/set the state of the + confirm_dialog_shown pref --> + <input type="checkbox" class="hidden" id="instantDialogShown" + pref="instant.confirm_dialog_shown"> + </label> + <div class="suboption"> + <span i18n-content="instantWarningText"></span> + <a target="_blank" i18n-values="href:instantLearnMoreLink" + i18n-content="learnMore"></a> + </div> + </div> </section> <if expr="not pp_ifdef('chromeos')"> <section> |