Do not invoke SetNaClArch if the hotword extension is new enough.

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 159 matching lines @@
     OnHotwordEnabledChanged();
     pref_change_registrar_.Init(profile->GetPrefs());
     pref_change_registrar_.Add(
         prefs::kHotwordSearchEnabled,
         base::Bind(&StartPageHandler::OnHotwordEnabledChanged,
                    base::Unretained(this)));
 
     extension_registry_observer_.Add(
         extensions::ExtensionRegistry::Get(profile));
   }
+
+  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) {
+    web_ui()->CallJavascriptFunction(
+        "appList.startPage.setNaclArch",
+        base::StringValue(omaha_query_params::OmahaQueryParams::GetNaclArch()));
+  }
 #endif
 
-  web_ui()->CallJavascriptFunction(
-      "appList.startPage.setNaclArch",
-      base::StringValue(omaha_query_params::OmahaQueryParams::GetNaclArch()));
-
   if (!app_list::switches::IsExperimentalAppListEnabled()) {
     web_ui()->CallJavascriptFunction(
         "appList.startPage.onAppListShown",
         base::FundamentalValue(service->HotwordEnabled()));
   }
 }
 
 void StartPageHandler::HandleLaunchApp(const base::ListValue* args) {
   std::string app_id;
   CHECK(args->GetString(0, &app_id));
@@ skipping 55 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