Index: chrome/browser/ui/webui/app_list/start_page_handler.cc |
diff --git a/chrome/browser/ui/webui/app_list/start_page_handler.cc b/chrome/browser/ui/webui/app_list/start_page_handler.cc |
index ace2cf5691a2dae99e24b6dbab4b5e88dc4034a4..184a8d94a5f05ebb62eee701c533434b6e858b00 100644 |
--- a/chrome/browser/ui/webui/app_list/start_page_handler.cc |
+++ b/chrome/browser/ui/webui/app_list/start_page_handler.cc |
@@ -177,11 +177,20 @@ void StartPageHandler::HandleInitialize(const base::ListValue* args) { |
extension_registry_observer_.Add( |
extensions::ExtensionRegistry::Get(profile)); |
} |
-#endif |
- web_ui()->CallJavascriptFunction( |
- "appList.startPage.setNaclArch", |
- base::StringValue(omaha_query_params::OmahaQueryParams::GetNaclArch())); |
+ 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 |
if (!app_list::switches::IsExperimentalAppListEnabled()) { |
web_ui()->CallJavascriptFunction( |