Chromium Code Reviews| 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 3395a5c2a593f0ccf4772ea3840c4c53ba1373e7..bf6fc284c78f4962a511c189862180e52e2839b7 100644 |
| --- a/chrome/browser/resources/options/browser_options.html |
| +++ b/chrome/browser/resources/options/browser_options.html |
| @@ -157,29 +157,47 @@ |
| i18n-content="defaultSearchManageEngines"> |
| </button> |
| </div> |
| - </div> |
| - </section> |
| - <section> |
| - <h3 id="voice-section-title" i18n-content="sectionTitleVoice" hidden></h3> |
| - <div id="voice-section-content"> |
| - <div id="hotword-always-on-search" hidden> |
| - <div class="checkbox controlled-setting-with-label"> |
| - <label> |
| - <input id="hotword-always-on-search-checkbox" |
| - pref="hotword.always_on_search_enabled" type="checkbox"> |
| - <span i18n-content="hotwordAlwaysOnSearchEnable"></span> |
| - </label> |
| + <div id="hotword-always-on-search" hidden> |
| + <div class="checkbox controlled-setting-with-label"> |
| + <label> |
| + <input id="hotword-always-on-search-checkbox" |
| + pref="hotword.always_on_search_enabled" type="checkbox"> |
| + <span i18n-content="hotwordSearchEnable"></span> |
| + </label> |
| + <a target="_blank" class="hotword-learn-more-link" |
| + i18n-content="learnMore" |
| + i18n-values="href:hotwordLearnMoreURL"></a> |
|
James Hawkins
2014/10/28 23:24:26
nit: Closing tag should be on a new line since the
kcarattini
2014/10/28 23:30:59
Done.
|
| + <div> |
| + <span class="hotword-description" |
| + i18n-content="hotwordAlwaysOnDesc"></span> |
|
James Hawkins
2014/10/28 23:24:26
nit: Closing tag should be on a new line since the
kcarattini
2014/10/28 23:30:58
Done.
|
| + </div> |
| + </div> |
| </div> |
| - </div> |
| - <div id="audio-logging" hidden> |
| - <div class="checkbox controlled-setting-with-label"> |
| - <label> |
| - <input pref="hotword.audio_logging_enabled" type="checkbox"> |
| - <span i18n-content="hotwordAudioHistoryEnable"></span> |
| - </label> |
| + <div id="hotword-no-dsp-search" hidden> |
| + <div class="checkbox controlled-setting-with-label"> |
| + <label> |
| + <input id="hotword-no-dsp-search-checkbox" |
| + pref="hotword.search_enabled_2" type="checkbox"> |
| + <span i18n-content="hotwordSearchEnable"></span> |
| + </label> |
| + <a target="_blank" class="hotword-learn-more-link" |
| + i18n-content="learnMore" |
| + i18n-values="href:hotwordLearnMoreURL"></a> |
|
James Hawkins
2014/10/28 23:24:26
nit: Closing tag should be on a new line since the
kcarattini
2014/10/28 23:30:59
Done.
|
| + <div> |
| + <span class="hotword-description" |
| + i18n-content="hotwordNoDSPDesc"></span> |
|
James Hawkins
2014/10/28 23:24:26
nit: Closing tag should be on a new line since the
kcarattini
2014/10/28 23:30:59
Done.
|
| + </div> |
| + </div> |
| + </div> |
| + <div id="audio-logging" hidden> |
| + <div class="checkbox controlled-setting-with-label"> |
| + <label> |
| + <input pref="hotword.audio_logging_enabled" type="checkbox"> |
| + <span i18n-content="hotwordAudioHistoryEnable"></span> |
| + </label> |
| + </div> |
| </div> |
| </div> |
| - </div> |
| </section> |
| <section id="sync-users-section" guest-visibility="hidden"> |
| <h3 i18n-content="sectionTitleUsers"></h3> |