Use the new hotword extension in the launcher when it is enabled.

chrome/browser/ui/webui/app_list/start_page_handler.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/webui/app_list/start_page_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 126 matching lines @@
   // TODO(mukai): remove this after everything gets stable.
   Profile* profile = Profile::FromWebUI(web_ui());
 
   extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(profile);
   const extensions::Extension* hotword_extension =
       registry->GetExtensionById(extension_misc::kHotwordExtensionId,
                                  extensions::ExtensionRegistry::ENABLED);
   if (hotword_extension &&
       hotword_extension->version()->CompareTo(
-          base::Version(kOldHotwordExtensionVersionString)) <= 0) {
+          base::Version(kOldHotwordExtensionVersionString)) <= 0 &&
+      !HotwordService::IsExperimentalHotwordingEnabled()) {
     StartPageService* service = StartPageService::Get(profile);
     web_ui()->CallJavascriptFunction(
         "appList.startPage.setHotwordEnabled",
         base::FundamentalValue(service->HotwordEnabled()));
   }
 }
 #endif
 
 void StartPageHandler::HandleInitialize(const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
@@ skipping 28 matching lines @@
   if (hotword_extension &&
       hotword_extension->version()->CompareTo(
           base::Version(kOldHotwordExtensionVersionString)) <= 0) {
     web_ui()->CallJavascriptFunction(
         "appList.startPage.setNaclArch",
         base::StringValue(omaha_query_params::OmahaQueryParams::GetNaclArch()));
   }
 #endif
 
   if (!app_list::switches::IsExperimentalAppListEnabled()) {
+    // If experimental hotwording is enabled, don't enable hotwording in the
+    // start page, since the hotword extension is taking care of this.
+    bool hotword_enabled = service->HotwordEnabled() &&
+        !HotwordService::IsExperimentalHotwordingEnabled();
     web_ui()->CallJavascriptFunction(
         "appList.startPage.onAppListShown",
-        base::FundamentalValue(service->HotwordEnabled()));
+        base::FundamentalValue(hotword_enabled));
   }
 }
 
 void StartPageHandler::HandleLaunchApp(const base::ListValue* args) {
   std::string app_id;
   CHECK(args->GetString(0, &app_id));
 
   Profile* profile = Profile::FromWebUI(web_ui());
   const extensions::Extension* app =
       extensions::ExtensionRegistry::Get(profile)
@@ skipping 51 matching lines @@
   else if (state_string == "NETWORK_ERROR")
     new_state = SPEECH_RECOGNITION_NETWORK_ERROR;
 
   StartPageService* service =
       StartPageService::Get(Profile::FromWebUI(web_ui()));
   if (service)
     service->OnSpeechRecognitionStateChanged(new_state);
 }
 
 }  // namespace app_list