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

Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

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

--- chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm (revision 91968)

+++ chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm (working copy)

@@ -14,10 +14,10 @@

#import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"

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

#include "content/browser/user_metrics.h"

+#include "content/common/content_notification_types.h"

#include "content/common/notification_observer.h"

#include "content/common/notification_service.h"

#include "content/common/notification_source.h"

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

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

@@ -35,14 +35,14 @@

public:

explicit ZoomLevelObserver(WrenchMenuController* controller)

: controller_(controller) {

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

+ registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,

NotificationService::AllSources());

}

- void Observe(NotificationType type,

+ void Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) {

- DCHECK_EQ(type.value, NotificationType::ZOOM_LEVEL_CHANGED);

+ DCHECK_EQ(type, content::NOTIFICATION_ZOOM_LEVEL_CHANGED);

WrenchMenuModel* wrenchMenuModel = [controller_ wrenchMenuModel];

wrenchMenuModel->UpdateZoomControls();

const string16 level =