[Hotword] Sync Audio History pref every 24 hours, when opening chrome://settings and . . .

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 26 matching lines @@
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/profiles/profiles_state.h"
+#include "chrome/browser/search/hotword_audio_history_handler.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/browser/search/hotword_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 1610 matching lines @@
   content::RecordAction(UserMetricsAction("Options_CloudPrintDevicesPage"));
   // Navigate in current tab to devices page.
   OpenURLParams params(
       GURL(chrome::kChromeUIDevicesURL), Referrer(),
       CURRENT_TAB, ui::PAGE_TRANSITION_LINK, false);
   web_ui()->GetWebContents()->OpenURL(params);
 }
 
 #endif
 
+void BrowserOptionsHandler::ShowHotwordAudioHistorySection(
+    bool always_on, bool success, bool logging_enabled) {
+  if (success && logging_enabled) {

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

if !success or !logging_enabled should this section be hidden?

[rpetterson, 2014/12/12 20:19:36]

Ideally, if !success we would show an error. I actually have a CL for that ready
to go once I get the final wording on the error from UX.

if (!logging_enabled && success), then we should not show it. Would you
recommend passing that into the function to ensure it stays hidden?

[Dan Beam, 2014/12/12 20:25:46]

i generally ask this type of question whenever I see a show* or hide* function
without a balanced counterpart (e.g. a show without a hide, etc.).

often we optimize for the common case but forget error/uncommon cases (another
reason why I like setVisible instead of show/hide -- because you are likely to
need both if you're "Doing It Right").

[rpetterson, 2014/12/12 21:39:56]

Since I prefer doing things the right way, I've updated the audio history
functions (in browser_options_handler and browser_options) to all be
SetAudioHistorySectionVisible.

+    web_ui()->CallJavascriptFunction("BrowserOptions.showAudioHistorySection",
+                                     base::FundamentalValue(always_on));
+  }
+  // TODO(rlp): Add version with error display.
+}
+
 void BrowserOptionsHandler::HandleRequestHotwordAvailable(
     const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
   std::string group = base::FieldTrialList::FindFullName("VoiceTrigger");
   if (group != "" && group != "Disabled" &&
       HotwordServiceFactory::IsHotwordAllowed(profile)) {
     // Update the current error value.
     HotwordServiceFactory::IsServiceAvailable(profile);
     int error = HotwordServiceFactory::GetCurrentError(profile);
 
@@ skipping 13 matching lines @@
       } else {
         function_name = "BrowserOptions.showHotwordNoDspSection";
       }
     } else {
       function_name = "BrowserOptions.showHotwordSection";
     }
 
     // Audio history should be displayed if it's enabled regardless of the
     // hotword error state. An additional message is displayed if always-on
     // hotwording is enabled.
-    if (profile->GetPrefs()->GetBoolean(prefs::kHotwordAudioLoggingEnabled) &&
-        HotwordService::IsExperimentalHotwordingEnabled()) {
-      web_ui()->CallJavascriptFunction("BrowserOptions.showAudioHistorySection",
-                                       base::FundamentalValue(always_on));
+    if (HotwordService::IsExperimentalHotwordingEnabled()) {
+      HotwordService* hotword_service =
+          HotwordServiceFactory::GetForProfile(profile);
+      if (hotword_service)

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

curlies

[rpetterson, 2014/12/12 20:19:36]

Done.

+        hotword_service->GetAudioHistoryHandler()->GetAudioHistoryEnabled(
+            base::Bind(&BrowserOptionsHandler::ShowHotwordAudioHistorySection,
+                       weak_ptr_factory_.GetWeakPtr(),
+                       always_on));
     }
 
     if (!error) {
       web_ui()->CallJavascriptFunction(function_name);
     } else {
       base::string16 hotword_help_url =
           base::ASCIIToUTF16(chrome::kHotwordLearnMoreURL);
       base::StringValue error_message(l10n_util::GetStringUTF16(error));
       if (error == IDS_HOTWORD_GENERIC_ERROR_MESSAGE) {
         error_message = base::StringValue(
@@ skipping 14 matching lines @@
   HotwordService::LaunchMode launch_mode =
       HotwordService::HOTWORD_AND_AUDIO_HISTORY;
 
   if (retrain) {
     DCHECK(profile->GetPrefs()->GetBoolean(
         prefs::kHotwordAlwaysOnSearchEnabled));
     DCHECK(profile->GetPrefs()->GetBoolean(
         prefs::kHotwordAudioLoggingEnabled));
 
     launch_mode = HotwordService::RETRAIN;
-    // TODO(rlp): Make sure the Chrome Audio History pref is synced
-    // to the account-level Audio History setting from footprints.
   } else if (profile->GetPrefs()->GetBoolean(
       prefs::kHotwordAudioLoggingEnabled)) {
     DCHECK(!profile->GetPrefs()->GetBoolean(
         prefs::kHotwordAlwaysOnSearchEnabled));
     launch_mode = HotwordService::HOTWORD_ONLY;
   } else {
     DCHECK(!profile->GetPrefs()->GetBoolean(
         prefs::kHotwordAlwaysOnSearchEnabled));
   }
 
@@ skipping 311 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