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 bde4c491582537b60d89a2c46ff4b0b04f42c6e6..26178e80c48b04339b1c496b0d76084a6021f1ca 100644 |
--- a/chrome/browser/resources/options/browser_options.html |
+++ b/chrome/browser/resources/options/browser_options.html |
@@ -139,6 +139,61 @@ |
</button> |
</div> |
</div> |
+ <div id ="hotword-search" hidden> |
+ <div class="checkbox"> |
+ <span class="controlled-setting-with-label"> |
+ <input id="hotword-search-enable" pref="hotword.search_enabled" |
+ type="checkbox"> |
+ <span> |
+ <label for="hotword-search-enable" |
+ i18n-values=".innerHTML:hotwordSearchEnable"> |
+ </label> |
+ <span class="controlled-setting-indicator" |
+ pref="hotword.search_enabled"> |
+ </span> |
+ </span> |
+ </span> |
+ <div id="hotword-search-description" class="hotword-settings"> |
+ <span i18n-content="hotwordSearchDescription"></span> |
rpetterson
2014/01/14 21:54:18
This line is actually supposed to be a light gray
samarth
2014/01/17 01:26:41
You're probably entering a "css specificity war".
rpetterson
2014/01/17 23:53:24
So I actually had this right before, but I just ha
|
+ </div> |
+ </div> |
+ <div id="hotword-settings-section" class="hotword-settings" hidden> |
+ <div id="hotword-settings-section-container"> |
+ <div class="checkbox"> |
+ <span class="controlled-setting-with-label"> |
+ <input id="hotword-search-timeout" |
+ pref="hotword.search_timeout_enabled" type="checkbox"> |
+ <span> |
+ <label for="hotword-search-timeout" |
+ i18n-content="hotwordSearchTimeout"> |
+ </label> |
+ <span class="controlled-setting-indicator" |
+ pref="hotword.search_timeout_enabled"> |
+ </span> |
+ </span> |
+ </span> |
+ <div id="hotword-search-timeout-description" |
+ class="hotword-settings"> |
+ <span i18n-content="hotwordSearchTimeoutDescription"></span> |
+ </div> |
+ </div> |
+ <div class="checkbox"> |
+ <span class="controlled-setting-with-label"> |
+ <input id="hotword-search-incognito-enable" |
+ pref="hotword.incognito_search_enabled" type="checkbox"> |
+ <span> |
+ <label for="hotword-search-incognito-enable" |
+ i18n-content="hotwordSearchIncognito"> |
+ </label> |
+ <span class="controlled-setting-indicator" |
+ pref="hotword.incognito_search_enabled"> |
+ </span> |
+ </span> |
+ </span> |
+ </div> |
+ </div> |
+ </div> |
+ </div> |
</section> |
<section id="sync-users-section" guest-visibility="hidden"> |
<h3 i18n-content="sectionTitleUsers"></h3> |