chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h - Issue 507363002: MacViews: Guard Objective-C bits in content::WebContentsViewDelegate with __OBJC__

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/chrome_web_contents_view_delegate_mac.h

Issue 507363002: MacViews: Guard Objective-C bits in content::WebContentsViewDelegate with __OBJC__ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix content_browsertests Created 6 years, 4 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 | « athena/content/web_contents_view_delegate_factory_impl.cc ('k') | chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm » ('j') | content/browser/web_contents/web_contents_view_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h

diff --git a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h

index ba128a3eefaf6c49dfc87010459e7278fa86f8f6..619c5ee25ab045bc6d5ff9d14648976c71c8b2cd 100644

--- a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h

+++ b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h

@@ -10,7 +10,7 @@

#include "base/basictypes.h"

#include "base/memory/scoped_ptr.h"

#include "components/renderer_context_menu/context_menu_delegate.h"

-#include "content/public/browser/web_contents_view_delegate.h"

+#import "content/public/browser/web_contents_view_delegate_mac.h"

class RenderViewContextMenu;

class RenderViewContextMenuMac;

@@ -24,20 +24,23 @@ class WebContents;

// A chrome/ specific class that extends WebContentsViewMac with features that

// live in chrome/.

class ChromeWebContentsViewDelegateMac

- : public content::WebContentsViewDelegate,

+ : public content::WebContentsViewDelegateMac,

public ContextMenuDelegate {

public:

explicit ChromeWebContentsViewDelegateMac(content::WebContents* web_contents);

virtual ~ChromeWebContentsViewDelegateMac();

- // Overridden from WebContentsViewDelegate:

+ // Overridden from WebContentsViewDelegateMac:

virtual NSObject<RenderWidgetHostViewMacDelegate>*

CreateRenderWidgetHostViewDelegate(

content::RenderWidgetHost* render_widget_host) OVERRIDE;

+ // Overridden from WebContentsViewDelegate:

virtual content::WebDragDestDelegate* GetDragDestDelegate() OVERRIDE;

virtual void ShowContextMenu(

content::RenderFrameHost* render_frame_host,

const content::ContextMenuParams& params) OVERRIDE;

+ virtual WebContentsViewDelegateMac* AsWebContentsViewDelegateMac() OVERRIDE;

// Overridden from ContextMenuDelegate.

virtual scoped_ptr<RenderViewContextMenu> BuildMenu(