chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm - Issue 11644057: Move BrowserAction out of Extension

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/browser_actions_controller.mm

Issue 11644057: Move BrowserAction out of Extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_ungoop_extension_action

Patch Set: Combined ActionInfo wrappers Created 8 years ago

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

Jump to:

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

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

index 3bc1b740624966706b1457d5153c1d99feb2b90e..5d533e712d9f6cdf628c577476e623aa2c8ad448 100644

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

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

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

#import "chrome/browser/ui/cocoa/image_button_cell.h"

#import "chrome/browser/ui/cocoa/menu_button.h"

#include "chrome/common/chrome_notification_types.h"

+#include "chrome/common/extensions/api/extension_action/browser_action_handler.h"

#include "chrome/common/pref_names.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

@@ -536,7 +537,7 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,

}

- (void)removeActionButtonForExtension:(const Extension*)extension {

- if (!extension->browser_action_info())

+ if (!BrowserActionInfo::GetBrowserAction(extension))

return;

NSString* buttonKey = base::SysUTF8ToNSString(extension->id());