chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm - Issue 425303002: Move extension notifications to extensions/browser/notification_types.h

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 425303002: Move extension notifications to extensions/browser/notification_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: (extension-notifications) rebase Created 6 years, 5 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/ui/cocoa/extensions/browser_action_button.mm ('k') | chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ee551c15cad490cfcbb9e61143ffa8219d5ed45d..c8281f35767b690e79dd2cf2a83695466dc90445 100644

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

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

@@ -184,11 +184,13 @@ class ExtensionServiceObserverBridge

ExtensionServiceObserverBridge(BrowserActionsController* owner,

Browser* browser)

: owner_(owner), browser_(browser) {

- registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,

- content::Source<Profile>(browser->profile()));

registrar_.Add(this,

- chrome::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC,

+ extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,

content::Source<Profile>(browser->profile()));

+ registrar_.Add(

+ this,

+ extensions::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC,

+ content::Source<Profile>(browser->profile()));

}

// Overridden from content::NotificationObserver.

@@ -197,14 +199,14 @@ class ExtensionServiceObserverBridge

const content::NotificationSource& source,

const content::NotificationDetails& details) OVERRIDE {

switch (type) {

- case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: {

+ case extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: {

ExtensionPopupController* popup = [ExtensionPopupController popup];

if (popup && ![popup isClosing])

[popup close];

break;

}

- case chrome::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC: {

+ case extensions::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC: {

std::pair<const std::string, gfx::NativeWindow>* payload =

content::Details<std::pair<const std::string, gfx::NativeWindow> >(

details).ptr();