Move BrowserAction out of Extension

chrome/utility/chrome_content_utility_client.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/utility/chrome_content_utility_client.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/importer/profile_import_process_messages.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_utility_messages.h"
+#include "chrome/common/extensions/api/extension_action/browser_action_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/extensions/unpacker.h"
 #include "chrome/common/extensions/update_manifest.h"
 #include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "chrome/common/zip.h"
 #include "chrome/utility/profile_import_handler.h"
 #include "content/public/utility/utility_thread.h"
 #include "printing/backend/print_backend.h"
 #include "printing/page_range.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/image_decoder.h"
 
 #if defined(OS_WIN)
 #include "base/path_service.h"
 #include "base/win/iat_patch_function.h"
 #include "base/win/scoped_handle.h"
 #include "content/public/common/content_switches.h"
 #include "printing/emf_win.h"
 #include "ui/gfx/gdi_util.h"
 #endif  // defined(OS_WIN)
 
+namespace {
+
+// Explicitly register all ManifestHandlers, since the subprocess won't have the

[Yoyo Zhou, 2012/12/28 05:19:59]

Comment should read "all ManifestHandlers needed in the utility process."

[Devlin, 2012/12/28 20:25:36]

Done.

[Yoyo Zhou, 2012/12/28 21:35:33]

I meant you could also remove the "since..." bit.

[Devlin, 2013/01/23 23:48:01]

Done.

+// same ManifestHandlerRegistry.
+void RegisterManifestHandlers() {

[Yoyo Zhou, 2012/12/28 05:19:59]

RegisterExtensionManifestHandlers is better.

[Devlin, 2012/12/28 20:25:36]

Done.

+  extensions::ManifestHandler::Register(
+      extension_manifest_keys::kBrowserAction,
+      new extensions::BrowserActionHandler);
+}
+
+}  // namespace
+
 namespace chrome {
 
 ChromeContentUtilityClient::ChromeContentUtilityClient() {
 #if !defined(OS_ANDROID)
   import_handler_.reset(new ProfileImportHandler());
 #endif
 }
 
 ChromeContentUtilityClient::~ChromeContentUtilityClient() {
 }
@@ skipping 54 matching lines @@
   return content::UtilityThread::Get()->Send(message);
 }
 
 void ChromeContentUtilityClient::OnUnpackExtension(
     const FilePath& extension_path,
     const std::string& extension_id,
     int location,
     int creation_flags) {
   CHECK(location > extensions::Extension::INVALID);
   CHECK(location < extensions::Extension::NUM_LOCATIONS);
+  RegisterManifestHandlers();
   extensions::Unpacker unpacker(
       extension_path,
       extension_id,
       static_cast<extensions::Extension::Location>(location),
       creation_flags);
   if (unpacker.Run() && unpacker.DumpImagesToFile() &&
       unpacker.DumpMessageCatalogsToFile()) {
     Send(new ChromeUtilityHostMsg_UnpackExtension_Succeeded(
         *unpacker.parsed_manifest()));
   } else {
@@ skipping 312 matching lines @@
   } else
 #endif
   {
     Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed(
         printer_name));
   }
   content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 
 }  // namespace chrome