chrome/browser/ui/cocoa/extensions/browser_action_button.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_action_button.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/download/download_started_animation_mac.mm ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

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

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

@@ -12,13 +12,13 @@

#include "chrome/browser/extensions/image_loading_tracker.h"

#include "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"

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

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

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

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

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

#include "content/common/notification_observer.h"

#include "content/common/notification_registrar.h"

#include "content/common/notification_source.h"

-#include "content/common/notification_type.h"

#include "skia/ext/skia_utils_mac.h"

#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"

#include "ui/gfx/canvas_skia_paint.h"

@@ -58,7 +58,7 @@

Extension::kBrowserActionIconMaxSize),

ImageLoadingTracker::DONT_CACHE);

}

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

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

Source<ExtensionAction>(extension->browser_action()));

}

@@ -73,10 +73,10 @@

}

// Overridden from NotificationObserver.

- void Observe(NotificationType type,

+ void Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) {

- if (type == NotificationType::EXTENSION_BROWSER_ACTION_UPDATED)

+ if (type == chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED)

[owner_ updateState];

else

NOTREACHED();