[Hotword] Ok Google options disappear if search provider is changed from

chrome/browser/search/hotword_service.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.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 725 matching lines @@
 
 HotwordAudioHistoryHandler* HotwordService::GetAudioHistoryHandler() {
   return audio_history_handler_.get();
 }
 
 void HotwordService::SetAudioHistoryHandler(
     HotwordAudioHistoryHandler* handler) {
   audio_history_handler_.reset(handler);
 }
 
+void HotwordService::DisableHotwordPreferences() {
+  if (IsSometimesOnEnabled()) {
+    if (profile_->GetPrefs()->HasPrefPath(prefs::kHotwordSearchEnabled))

[Dan Beam, 2014/12/04 20:44:07]

why do you need to check HasPrefPath?

[rpetterson, 2014/12/04 23:20:28]

We have some special cases for if the user has not set the preference (e.g.,
promos) so if the preference doesn't currently exist, we'd like to maintain that
state.

+      profile_->GetPrefs()->SetBoolean(prefs::kHotwordSearchEnabled, false);
+  } else if (IsAlwaysOnEnabled()) {
+    if (profile_->GetPrefs()->HasPrefPath(
+            prefs::kHotwordAlwaysOnSearchEnabled)) {
+      profile_->GetPrefs()->SetBoolean(prefs::kHotwordAlwaysOnSearchEnabled,
+                                       false);
+    }
+  }
+}
+
 void HotwordService::OnHotwordSearchEnabledChanged(
     const std::string& pref_name) {
   DCHECK_EQ(pref_name, std::string(prefs::kHotwordSearchEnabled));
 
   ExtensionService* extension_service = GetExtensionService(profile_);
   if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled))
     EnableHotwordExtension(extension_service);
   else
     DisableHotwordExtension(extension_service);
 }
@@ skipping 58 matching lines @@
   HotwordPrivateEventService* event_service =
       BrowserContextKeyedAPIFactory<HotwordPrivateEventService>::Get(profile_);
   // "enabled" isn't being changed, but piggy-back off the notification anyway.
   if (event_service)
     event_service->OnEnabledChanged(prefs::kHotwordSearchEnabled);
 }
 
 bool HotwordService::UserIsActive() {
   return profile_ == ProfileManager::GetActiveUserProfile();
 }