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

chrome/browser/ui/webui/options/browser_options_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/browser_options_handler.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 1187 matching lines @@
   }
 
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.updateSearchEngines",
       search_engines,
       base::FundamentalValue(default_index),
       base::FundamentalValue(
           template_url_service_->is_default_search_managed() ||
           template_url_service_->IsExtensionControlledDefaultSearch()));
 
+  if (model_urls[default_index]->HasGoogleBaseURLs(
+    template_url_service_->search_terms_data())) {

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

looks confusingly like it's inside the conditional, add more spaces

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

Done.

+    // If the user has chosen Google as the default search provider, make
+    // hotwording as an option available again.
+    HandleRequestHotwordAvailable(nullptr);

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

how does the hotword section get unhidden?

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

That function -- HandleRequestHotwordAvailable -- deals with the checking based
on flags and preference values to determine which hotword section is shown.
Ultimately it calls one of BrowserOptions.showHotwordAlwaysOnSection,
BrowserOptions.showHotwordNoDspSection or BrowserOptions.showHotwordSection (as
well as BrowserOptions.showAudioHistorySection if applicable). The args
parameter is not used which is why I am passing nullptr.

+  } else {
+    // If the user has chosen a default search provide other than Google, turn
+    // off hotwording since other providers don't provide that functionality.
+    web_ui()->CallJavascriptFunction("BrowserOptions.hideHotwordSection");
+    HotwordService* hotword_service =
+      HotwordServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()));

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

4\s indent on continuations

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

Argh. Thank you. I have to figure out a way to get VS to do that automatically .
. . :-/

+    if (hotword_service)

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

how often is |hotword_service| null here?

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

Mostly in some tests but also any platform/situation that doesn't enable
extensions (Android?). It should never be null in practice for desktop or CrOS.

+      hotword_service->DisableHotwordPreferences();
+  }
+
   SetupExtensionControlledIndicators();
 }
 
 void BrowserOptionsHandler::SetDefaultSearchEngine(
     const base::ListValue* args) {
   int selected_index = -1;
   if (!ExtractIntegerValue(args, &selected_index)) {
     NOTREACHED();
     return;
   }
@@ skipping 832 matching lines @@
 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
                                             const policy::PolicyMap& previous,
                                             const policy::PolicyMap& current) {
   std::set<std::string> different_keys;
   current.GetDifferingKeys(previous, &different_keys);
   if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
     SetupMetricsReportingCheckbox();
 }
 
 }  // namespace options