Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4870)

Unified Diff: chrome/browser/resources/options/browser_options.html

Issue 4245002: Add instant to tabbed options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: smorgan review Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options/browser_options.html
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 7950913a05fcd3a3e41ddd58fa4c8a9966cf175b..2e8c6505428497d179f91e545c015dbc9b3d5764 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -64,13 +64,27 @@
</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>
+ <!-- TODO(estade): toggling this needs to launch the warning dialog -->
+ <label class="checkbox" id="instantOption">
+ <!-- TODO(estade): metric? -->
+ <input type="checkbox" id="instantEnableCheckbox"
+ pref="instant.enabled">
+ <span i18n-content="instantName"></span>
+ </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>
« no previous file with comments | « chrome/browser/resources/options/advanced_options.html ('k') | chrome/browser/resources/options/browser_options_page.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698