summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/options/browser_options.html
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/resources/options/browser_options.html')
-rw-r--r--chrome/browser/resources/options/browser_options.html31
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>