chrome/browser/ui/cocoa/toolbar/toolbar_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/toolbar/toolbar_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/theme_install_bubble_view.mm ('k') | chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

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

--- chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm (revision 91968)

+++ chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm (working copy)

@@ -44,12 +44,12 @@

#include "chrome/browser/ui/toolbar/toolbar_model.h"

#include "chrome/browser/ui/toolbar/wrench_menu_model.h"

#include "chrome/browser/upgrade_detector.h"

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

#include "chrome/common/pref_names.h"

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

#include "content/common/notification_details.h"

#include "content/common/notification_observer.h"

#include "content/common/notification_service.h"

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

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

@@ -123,19 +123,19 @@

public:

explicit NotificationBridge(ToolbarController* controller)

: controller_(controller) {

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

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

NotificationService::AllSources());

}

// Overridden from NotificationObserver:

- virtual void Observe(NotificationType type,

+ virtual void Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) {

- switch (type.value) {

- case NotificationType::PREF_CHANGED:

+ switch (type) {

+ case chrome::NOTIFICATION_PREF_CHANGED:

[controller_ prefChanged:Details<std::string>(details).ptr()];

break;

- case NotificationType::UPGRADE_RECOMMENDED:

+ case chrome::NOTIFICATION_UPGRADE_RECOMMENDED:

[controller_ badgeWrenchMenuIfNeeded];

break;

default: