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, 10 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') | no next file with comments »
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 81beb7f231393ea8a7e3f3cc38c2e208ac610bc0..73e0af3f57330861daeba2a123d83aefa6cc4fdf 100644

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

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

@@ -32,6 +32,7 @@

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

@@ -130,7 +131,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;

@@ -616,7 +617,9 @@ class ExtensionLoadedNotificationObserver

[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];