Creates new chrome:settings section, 'Voice'.

Moves hotwording checkbox to new 'Voice' section.

BUG=390086

Review URL: https://codereview.chromium.org/382123004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284301 0039d316-1c4b-4281-b951-d872f2087c98
parent cb756004
...@@ -9847,6 +9847,9 @@ Chrome ran out of memory. ...@@ -9847,6 +9847,9 @@ Chrome ran out of memory.
<message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="The title of the default search engine group"> <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="The title of the default search engine group">
Search Search
</message> </message>
<message name="IDS_OPTIONS_VOICE_GROUP_NAME" desc="The title of the voice group in the settings page">
Voice
</message>
<message name="IDS_SEARCH_ENGINE_ADD_NEW_NAME_PLACEHOLDER" desc="Placeholder text for name before the user adds a new search engine" > <message name="IDS_SEARCH_ENGINE_ADD_NEW_NAME_PLACEHOLDER" desc="Placeholder text for name before the user adds a new search engine" >
Add a new search engine Add a new search engine
</message> </message>
......
...@@ -152,6 +152,27 @@ ...@@ -152,6 +152,27 @@
</div> </div>
</div> </div>
</section> </section>
<section>
<h3 i18n-content="sectionTitleVoice"></h3>
<div id="voice-section-content">
<div id="hotword-search" hidden>
<div class="checkbox">
<span class="controlled-setting-with-label">
<input id="hotword-search-enable" pref="hotword.search_enabled_2"
metric="Options_HotwordCheckbox" type="checkbox" dialog-pref>
<span>
<label for="hotword-search-enable"
i18n-values=".innerHTML:hotwordSearchEnable">
</label>
<span id="hotword-search-setting-indicator"
pref="hotword.search_enabled_2" dialog-pref>
</span>
</span>
</span>
</div>
</div>
</div>
</section>
<section id="sync-users-section" guest-visibility="hidden"> <section id="sync-users-section" guest-visibility="hidden">
<h3 i18n-content="sectionTitleUsers"></h3> <h3 i18n-content="sectionTitleUsers"></h3>
<if expr="chromeos"> <if expr="chromeos">
...@@ -402,22 +423,6 @@ ...@@ -402,22 +423,6 @@
</span> </span>
</div> </div>
</if> </if>
<div id="hotword-search" hidden>
<div class="checkbox">
<span class="controlled-setting-with-label">
<input id="hotword-search-enable" pref="hotword.search_enabled_2"
metric="Options_HotwordCheckbox" type="checkbox" dialog-pref>
<span>
<label for="hotword-search-enable"
i18n-values=".innerHTML:hotwordSearchEnable">
</label>
<span id="hotword-search-setting-indicator"
pref="hotword.search_enabled_2" dialog-pref>
</span>
</span>
</span>
</div>
</div>
</div> </div>
</section> </section>
<if expr="chromeos"> <if expr="chromeos">
......
...@@ -314,6 +314,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { ...@@ -314,6 +314,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
{ "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME },
{ "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME }, { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME },
{ "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME },
{ "sectionTitleVoice", IDS_OPTIONS_VOICE_GROUP_NAME },
{ "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT }, { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT },
{ "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE }, { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE },
{ "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE }, { "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment