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"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/bundle_installer.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #include "chrome/browser/ui/cocoa/hover_close_button.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/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/chrome_notification_types.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 76 matching lines @@
     extensions::ExtensionActionManager* extension_action_manager =
         extensions::ExtensionActionManager::Get(browser_->profile());
 
     if (bundle_) {
       type_ = extension_installed_bubble::kBundle;
     } 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 371 matching lines @@
     return;
   }
 
   NSRect extensionMessageFrame1 = [extensionInstalledMsg_ frame];
   NSRect extensionMessageFrame2 = [extensionInstalledInfoMsg_ frame];
 
   extensionMessageFrame1.origin.y = newWindowHeight - (
       extensionMessageFrame1.size.height +
       extension_installed_bubble::kOuterVerticalMargin);
   [extensionInstalledMsg_ setFrame:extensionMessageFrame1];
-  if (extensions::OmniboxInfo::IsVerboseInstallMessage(extension_)) {
+  if (!extensions::OmniboxInfo::GetKeyword(extension_).empty() ||
+      extension_->browser_action_info() ||
+      extensions::ActionInfo::IsVerboseInstallMessage(extension_)) {
     // The extra message is only shown when appropriate.
     NSRect extraMessageFrame = [extraInfoMsg_ frame];
     extraMessageFrame.origin.y = extensionMessageFrame1.origin.y - (
         extraMessageFrame.size.height +
         extension_installed_bubble::kInnerVerticalMargin);
     [extraInfoMsg_ setFrame:extraMessageFrame];
     extensionMessageFrame2.origin.y = extraMessageFrame.origin.y - (
         extensionMessageFrame2.size.height +
         extension_installed_bubble::kInnerVerticalMargin);
   } else {
@@ skipping 36 matching lines @@
 - (IBAction)onManageShortcutClicked:(id)sender {
   [self close];
   std::string configure_url = chrome::kChromeUIExtensionsURL;
   configure_url += chrome::kExtensionConfigureCommandsSubPage;
   chrome::NavigateParams params(chrome::GetSingletonTabNavigateParams(
       browser_, GURL(configure_url)));
   chrome::Navigate(&params);
 }
 
 @end