Move page action manifest parsing out of Extension; the first multi-key manifest handler.

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/api/extension_action/page_action_handler.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/api/themes/theme_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.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"
@@ skipping 20 matching lines @@
 namespace {
 
 // Explicitly register all ManifestHandlers needed in the utility process.
 void RegisterExtensionManifestHandlers() {
   extensions::ManifestHandler::Register(
       extension_manifest_keys::kBrowserAction,
       make_linked_ptr(new extensions::BrowserActionHandler));
   extensions::ManifestHandler::Register(
       extension_manifest_keys::kDefaultLocale,
       make_linked_ptr(new extensions::DefaultLocaleHandler));
+  linked_ptr<extensions::PageActionHandler> page_action_handler(
+      new extensions::PageActionHandler);
+  extensions::ManifestHandler::Register(
+      extension_manifest_keys::kPageAction, page_action_handler);
+  extensions::ManifestHandler::Register(
+      extension_manifest_keys::kPageActions, page_action_handler);
   extensions::ManifestHandler::Register(
       extension_manifest_keys::kTheme,
       make_linked_ptr(new extensions::ThemeHandler));
 }
 
 }  // namespace
 
 namespace chrome {
 
 ChromeContentUtilityClient::ChromeContentUtilityClient() {
@@ skipping 395 matching lines @@
   } else
 #endif
   {
     Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed(
         printer_name));
   }
   content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 
 }  // namespace chrome