Adds the audio history and always on hotwording settings.

chrome/browser/search/hotword_service_factory.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search/hotword_service_factory.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/common/pref_names.h"
@@ skipping 80 matching lines @@
   // state will be updated very soon and call OnUpdateAudioDevices.
   OnUpdateAudioDevices(devices);
 }
 
 void HotwordServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* prefs) {
   prefs->RegisterBooleanPref(prefs::kHotwordSearchEnabled,
                              false,
                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   // Although this is default true, users will not send back information to
-  // Google unless they have opted in to Hotwording at which point they must
+  // Google unless they have opted into Hotwording at which point they must
   // also confirm that they wish this preference to be true or opt out of it.
   prefs->RegisterBooleanPref(prefs::kHotwordAudioLoggingEnabled,
                              true,
                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kHotwordPreviousLanguage,
                             std::string(),
                             user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  prefs->RegisterBooleanPref(prefs::kHotwordAlwaysOnSearchEnabled,

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

Does not compile without OS_CHROMEOS. Should be guarded by #ifdef (or not -- see
my comment in pref_names.cc).

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

Acknowledged.

+                             false,
+                             user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 KeyedService* HotwordServiceFactory::BuildServiceInstanceFor(
     BrowserContext* context) const {
   return new HotwordService(Profile::FromBrowserContext(context));
 }