Index: chrome/browser/ui/webui/app_list/start_page_handler.h |
diff --git a/chrome/browser/ui/webui/app_list/start_page_handler.h b/chrome/browser/ui/webui/app_list/start_page_handler.h |
index 76d6b0b0f94a558d871968b5eee97caa985b3f65..3e4692b06b29a4a12952df2d2d48e2918c59bad1 100644 |
--- a/chrome/browser/ui/webui/app_list/start_page_handler.h |
+++ b/chrome/browser/ui/webui/app_list/start_page_handler.h |
@@ -8,12 +8,10 @@ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/prefs/pref_change_registrar.h" |
-#include "chrome/browser/ui/app_list/hotword_background_activity_delegate.h" |
#include "chrome/browser/ui/app_list/recommended_apps_observer.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
#include "content/public/browser/web_ui_message_handler.h" |
-#include "ui/app_list/speech_ui_model_observer.h" |
namespace base { |
class ListValue; |
@@ -21,13 +19,11 @@ class ListValue; |
namespace app_list { |
-class HotwordBackgroundActivityMonitor; |
class RecommendedApps; |
// Handler for the app launcher start page. |
class StartPageHandler : public content::WebUIMessageHandler, |
public content::NotificationObserver, |
- public HotwordBackgroundActivityDelegate, |
public RecommendedAppsObserver { |
public: |
StartPageHandler(); |
@@ -37,15 +33,11 @@ class StartPageHandler : public content::WebUIMessageHandler, |
// content::WebUIMessageHandler overrides: |
virtual void RegisterMessages() OVERRIDE; |
- // content::NotificationObserver overrides: |
+ // Overridden from content::NotificationObserver: |
virtual void Observe(int type, |
const content::NotificationSource& source, |
const content::NotificationDetails& details) OVERRIDE; |
- // HotwordBackgroundActivityDelegate overrides: |
- virtual int GetRenderProcessID() OVERRIDE; |
- virtual void OnHotwordBackgroundActivityChanged() OVERRIDE; |
- |
// RecommendedAppsObserver overrdies: |
virtual void OnRecommendedAppsChanged() OVERRIDE; |
@@ -60,21 +52,14 @@ class StartPageHandler : public content::WebUIMessageHandler, |
void OnHotwordEnabledChanged(); |
#endif |
- // Returns true if the hotword recognizer should run background. |
- bool ShouldRunHotwordBackground(); |
- |
// JS callbacks. |
void HandleInitialize(const base::ListValue* args); |
void HandleLaunchApp(const base::ListValue* args); |
- void HandleHotwordRecognizerState(const base::ListValue* args); |
void HandleSpeechResult(const base::ListValue* args); |
void HandleSpeechSoundLevel(const base::ListValue* args); |
void HandleSpeechRecognition(const base::ListValue* args); |
RecommendedApps* recommended_apps_; // Not owned. |
- bool has_hotword_recognizer_; |
- scoped_ptr<HotwordBackgroundActivityMonitor> hotword_monitor_; |
- SpeechRecognitionState last_state_; |
PrefChangeRegistrar pref_change_registrar_; |
content::NotificationRegistrar registrar_; |