chrome/browser/ui/cocoa/tab_contents/tab_contents_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/tab_contents/tab_contents_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/location_bar/page_action_decoration.mm ('k') | chrome/browser/ui/cocoa/theme_install_bubble_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm

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

--- chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm (revision 91968)

+++ chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm (working copy)

@@ -9,11 +9,11 @@

#include "content/browser/renderer_host/render_widget_host_view.h"

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

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

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

#include "content/common/notification_details.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"

@interface TabContentsController(Private)

// Forwards frame update to |delegate_| (ResizeNotificationView calls it).

@@ -31,7 +31,7 @@

explicit TabContentsNotificationBridge(TabContentsController* controller);

// Overriden from NotificationObserver.

- virtual void Observe(NotificationType type,

+ virtual void Observe(int type,

const NotificationSource& source,

const NotificationDetails& details);

// Register for |contents|'s notifications, remove all prior registrations.

@@ -47,10 +47,10 @@

}

void TabContentsNotificationBridge::Observe(

- NotificationType type,

+ int type,

const NotificationSource& source,

const NotificationDetails& details) {

- if (type == NotificationType::RENDER_VIEW_HOST_CHANGED) {

+ if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) {

RenderViewHostSwitchedDetails* switched_details =

Details<RenderViewHostSwitchedDetails>(details).ptr();

[controller_ tabContentsRenderViewHostChanged:switched_details->old_host

@@ -64,7 +64,7 @@

registrar_.RemoveAll();

if (contents) {

registrar_.Add(this,

- NotificationType::RENDER_VIEW_HOST_CHANGED,

+ content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,

Source<NavigationController>(&contents->controller()));

}