chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm - Issue 12042096: Move page action manifest parsing out of Extension; the first multi-key manifest handler.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

Issue 12042096: Move page action manifest parsing out of Extension; the first multi-key manifest handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_action_manager.cc ('k') | chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc » ('j') | chrome/common/extensions/api/extension_action/page_action_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

index 0e54d294278f836821a95b5b9ca1f6f3a81a8c8a..74ed3d8c29a49a97ad1485606696c0286dc63faf 100644

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

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

@@ -25,6 +25,7 @@

#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"

@@ -121,7 +122,7 @@ class ExtensionLoadedNotificationObserver

} 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;

@@ -513,7 +514,9 @@ class ExtensionLoadedNotificationObserver

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 - (