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

chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h"
 
 #include "base/i18n/rtl.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 14 matching lines @@
 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #include "chrome/browser/ui/cocoa/info_bubble_view.h"
 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/new_tab_button.h"
 #include "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/commands/commands_handler.h"
+#include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/api/omnibox/omnibox_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #import "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
@@ skipping 78 matching lines @@
 
     if (bundle_) {
       type_ = extension_installed_bubble::kBundle;
     } else if (extension->is_app()) {
       type_ = extension_installed_bubble::kApp;
     } else if (!extensions::OmniboxInfo::GetKeyword(extension).empty()) {
       type_ = extension_installed_bubble::kOmniboxKeyword;
     } else if (extension_action_manager->GetBrowserAction(*extension)) {
       type_ = extension_installed_bubble::kBrowserAction;
     } else if (extension_action_manager->GetPageAction(*extension) &&
-               extensions::OmniboxInfo::IsVerboseInstallMessage(extension)) {
+               extensions::ActionInfo::IsVerboseInstallMessage(extension)) {
       type_ = extension_installed_bubble::kPageAction;
     } else {
       type_ = extension_installed_bubble::kGeneric;
     }
 
     if (type_ == extension_installed_bubble::kBundle) {
       [self showWindow:self];
     } else {
       // Start showing window only after extension has fully loaded.
       extensionObserver_.reset(new ExtensionLoadedNotificationObserver(
@@ skipping 465 matching lines @@
     return;
   }
 
   NSRect headingFrame = [heading_ frame];
   headingFrame.origin.y = newWindowHeight - (
       NSHeight(headingFrame) +
       extension_installed_bubble::kOuterVerticalMargin);
   [heading_ setFrame:headingFrame];
 
   NSRect howToManageFrame = [howToManage_ frame];
-  if (extensions::OmniboxInfo::IsVerboseInstallMessage(extension_)) {
+  if (!extensions::OmniboxInfo::GetKeyword(extension_).empty() ||
+      extensions::ActionInfo::GetBrowserActionInfo(extension_) ||
+      extensions::ActionInfo::IsVerboseInstallMessage(extension_)) {
     // For browser actions, page actions and omnibox keyword show the
     // 'how to use' message before the 'how to manage' message.
     NSRect howToUseFrame = [howToUse_ frame];
     howToUseFrame.origin.y = headingFrame.origin.y - (
         NSHeight(howToUseFrame) +
         extension_installed_bubble::kInnerVerticalMargin);
     [howToUse_ setFrame:howToUseFrame];
 
     howToManageFrame.origin.y = howToUseFrame.origin.y - (
         NSHeight(howToManageFrame) +
@@ skipping 64 matching lines @@
   ExtensionInstallUI::OpenAppInstalledUI(browser_, extension_->id());
 }
 
 - (void)awakeFromNib {
   if (bundle_)
     return;
   [self initializeLabel];
 }
 
 @end