chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm - Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type...

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 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 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_action_context_menu.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

===================================================================

--- chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm (revision 91968)

+++ chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm (working copy)

@@ -22,6 +22,7 @@

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

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

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

+#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/extensions/extension_action.h"

#include "chrome/common/pref_names.h"

#include "content/browser/tab_contents/tab_contents.h"

@@ -183,16 +184,16 @@

public:

ExtensionServiceObserverBridge(BrowserActionsController* owner,

Profile* profile) : owner_(owner) {

- registrar_.Add(this, NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,

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

Source<Profile>(profile));

}

// Overridden from NotificationObserver.

- void Observe(NotificationType type,

+ void Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) {

- switch (type.value) {

- case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE: {

+ switch (type) {

+ case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: {

ExtensionPopupController* popup = [ExtensionPopupController popup];

if (popup && ![popup isClosing])

[popup close];