Adds the audio history and always on hotwording settings.

chrome/browser/resources/options/browser_options.html

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 fcfcd156c31496dc067eea3310926219474362bf..8f32dd698242b730e5014f0e945b24b946285680 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -170,6 +170,52 @@
           </span>
         </div>
       </div>
+      <div id="hotword-always-on-search" hidden>

[Matt Giuca, 2014/08/12 08:37:39]

These do not have the logic we discussed where they would become disabled if the
previous ones were unchecked. Do you plan to do that in a follow-up CL? (I'm
happy with that btw, especially since the exact behaviour is unclear, but you
should note it in the CL description.)

There's also a bit more confusion I have with regards to the third checkbox --
in that it should grey out the second one (so maybe we need to swap those two),
and also that it is duplicated on the confirmation screen of the first checkbox.
Let's discuss the user flows and maybe we can simplify this tomorrow.

[kcarattini, 2014/08/13 03:51:53]

This is just adding the pref and checkbox. Disabling behaviour will be added in
another cl once we've decided on a course of action.

[Matt Giuca, 2014/08/13 05:21:09]

Acknowledged.

+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="hotword-always-on-search-enable"
+                pref="hotword.always_on_search_enabled"
+                type="checkbox">
+            <span>
+              <div>
+                <div>
+                  <label for="hotword-always-on-search-enable"

[Matt Giuca, 2014/08/12 08:37:39]

Having two labels for a checkbox feels weird. I think you should condense the
text into a single label for each checkbox.

[kcarattini, 2014/08/13 03:51:53]

Done.

+                      i18n-content="hotwordAlwaysOnSearchEnable">
+                  </label>
+                </div>
+                <div>
+                  <label for="hotword-always-on-search-enable"
+                      i18n-content="hotwordAlwaysOnSearchDescription">
+                  </label>
+                </div>
+              </div>
+            </span>
+          </span>
+        </div>
+      </div>
+      <div id="audio-logging" hidden>
+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="audio-logging-enable"
+                pref="hotword.audio_logging_enabled"
+                type="checkbox">
+            <span>
+              <div>
+                <div>
+                  <label for="audio-logging-enable"
+                      i18n-content="hotwordAudioHistoryEnable">
+                  </label>
+                </div>
+                <div>
+                  <label for="audio-logging-enable"
+                      i18n-content="hotwordAudioHistoryDescription">
+                  </label>
+                </div>
+              </div>
+            </span>
+          </span>
+        </div>
+      </div>
     </div>
   </section>
   <section id="sync-users-section" guest-visibility="hidden">