Add new hotword extension for built-in hotword triggering.

chrome/browser/extensions/component_loader.cc

 // Copyright (c) 2012 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/extensions/component_loader.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 291 matching lines @@
 void ComponentLoader::AddHangoutServicesExtension() {
 #if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
   Add(IDR_HANGOUT_SERVICES_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("hangout_services")));
 #endif
 }
 
 void ComponentLoader::AddHotwordHelperExtension() {
 #if defined(ENABLE_EXTENSIONS)
   if (HotwordServiceFactory::IsHotwordAllowed(browser_context_)) {
-    Add(IDR_HOTWORD_HELPER_MANIFEST,
-        base::FilePath(FILE_PATH_LITERAL("hotword_helper")));
+    bool loadedHotwordExtension = false;
+#if defined(OS_CHROMEOS)

[James Hawkins, 2014/08/05 08:59:45]

Please get rid of this #ifdef by creating a ChromeOS implementation of
ComponentLoader which inherits from ComponentLoader and overwrites this method. 
See any of the other _chromeos.[h,cc] files in this directory for examples.

[Anand Mistry (off Chromium), 2014/08/06 01:46:07]

I've been meaning to change this flag and move it into chrome since it's not
chromeos-specific. I've done that in 442183002 and rebased this change onto
that.

+    CommandLine* command_line = CommandLine::ForCurrentProcess();
+    loadedHotwordExtension =
+        command_line->HasSwitch(chromeos::switches::kEnableOkGoogleVoiceSearch);
+    if (loadedHotwordExtension) {
+      Add(IDR_HOTWORD_MANIFEST,
+          base::FilePath(FILE_PATH_LITERAL("hotword")));
+    }
+#endif  // defined(OS_CHROMEOS)
+    if (!loadedHotwordExtension) {
+      Add(IDR_HOTWORD_HELPER_MANIFEST,
+          base::FilePath(FILE_PATH_LITERAL("hotword_helper")));
+    }
   }
 #endif
 }
 
 void ComponentLoader::AddImageLoaderExtension() {
 #if defined(IMAGE_LOADER_EXTENSION)
   Add(IDR_IMAGE_LOADER_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("image_loader")));
 #endif  // defined(IMAGE_LOADER_EXTENSION)
 }
@@ skipping 334 matching lines @@
         off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
     fileapi::FileSystemContext* file_system_context =
         content::BrowserContext::GetStoragePartitionForSite(
             off_the_record_context, site)->GetFileSystemContext();
     file_system_context->EnableTemporaryFileSystemInIncognito();
   }
 #endif
 }
 
 }  // namespace extensions