Adds HotwordPrivate API for integrating the hotword feature to AppLauncher

chrome/browser/ui/app_list/start_page_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/ui/app_list/start_page_service.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/user_metrics.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/media/media_stream_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search/hotword_service.h"
 #include "chrome/browser/search/hotword_service_factory.h"
 #include "chrome/browser/ui/app_list/recommended_apps.h"
 #include "chrome/browser/ui/app_list/start_page_observer.h"
 #include "chrome/browser/ui/app_list/start_page_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ skipping 70 matching lines @@
   return StartPageServiceFactory::GetForProfile(profile);
 }
 
 StartPageService::StartPageService(Profile* profile)
     : profile_(profile),
       profile_destroy_observer_(new ProfileDestroyObserver(this)),
       recommended_apps_(new RecommendedApps(profile)),
       state_(app_list::SPEECH_RECOGNITION_OFF),
       speech_button_toggled_manually_(false),
       speech_result_obtained_(false) {
-#if defined(OS_CHROMEOS)
-  // Updates the default state to hotword listening, because this is
-  // the default behavior. This will be updated when the page is loaded and
-  // the nacl module is loaded.
-  if (app_list::switches::IsVoiceSearchEnabled())
-    state_ = app_list::SPEECH_RECOGNITION_HOTWORD_LISTENING;
-#endif
-
   if (app_list::switches::IsExperimentalAppListEnabled())
     LoadContents();
 }
 
 StartPageService::~StartPageService() {}
 
 void StartPageService::AddObserver(StartPageObserver* observer) {
   observers_.AddObserver(observer);
 }
 
@@ skipping 19 matching lines @@
 }
 
 void StartPageService::ToggleSpeechRecognition() {
   speech_button_toggled_manually_ = true;
   contents_->GetWebUI()->CallJavascriptFunction(
       "appList.startPage.toggleSpeechRecognition");
 }
 
 bool StartPageService::HotwordEnabled() {
 #if defined(OS_CHROMEOS)
-  if (!HotwordService::DoesHotwordSupportLanguage(profile_))
-    return false;
-
-  const PrefService::Preference* preference =
-      profile_->GetPrefs()->FindPreference(prefs::kHotwordSearchEnabled);
-  if (!preference)
-    return false;
-
-  if (!HotwordServiceFactory::IsServiceAvailable(profile_))
-    return false;
-
-  // kHotwordSearchEnabled is off by default, but app-list is on by default.
-  // To achieve this, we'll return true if it's in the default status.
-  if (preference->IsDefaultValue())
-    return true;
-
-  bool isEnabled = false;
-  return preference->GetValue()->GetAsBoolean(&isEnabled) && isEnabled;
+  return HotwordServiceFactory::IsServiceAvailable(profile_) &&
+      profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled);
 #else
   return false;
 #endif
 }
 
 content::WebContents* StartPageService::GetStartPageContents() {
   return app_list::switches::IsExperimentalAppListEnabled() ? contents_.get()
                                                             : NULL;
 }
 
@@ skipping 66 matching lines @@
       content::Referrer(),
       content::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }
 
 void StartPageService::UnloadContents() {
   contents_.reset();
 }
 
 }  // namespace app_list