chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.mm - Issue 9420007: Move RenderWidgetHostView into content namespace. Fix include paths.

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/tab_contents/chrome_web_contents_view_mac_delegate.mm

Issue 9420007: Move RenderWidgetHostView into content namespace. Fix include paths. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix linux_chromeos_gtk build issue not caught by trybots. Created 8 years, 10 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/tab_contents/chrome_tab_contents_view_wrapper_gtk.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.mm

diff --git a/chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.mm b/chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.mm

index fbf74ac60111ef62012577b02d7a323827c4dd23..2b787a02eb1050a7de0142d3773e9a9e0fe92179 100644

--- a/chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.mm

+++ b/chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.mm

@@ -8,7 +8,7 @@

#include "chrome/browser/tab_contents/render_view_context_menu_mac.h"

#include "chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h"

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

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

+#include "content/public/browser/render_widget_host_view.h"

#include "content/public/browser/web_contents.h"

namespace chrome_web_contents_view_mac_delegate {

@@ -47,7 +47,8 @@ void ChromeWebContentsViewMacDelegate::ShowContextMenu(

// the second mouse event arrives. In this case, |ShowContextMenu()| will

// get called multiple times - if so, don't create another context menu.

// TODO(asvitkine): Fix the renderer so that it doesn't do this.

- RenderWidgetHostView* widget_view = web_contents_->GetRenderWidgetHostView();

+ content::RenderWidgetHostView* widget_view =

+ web_contents_->GetRenderWidgetHostView();

if (widget_view && widget_view->IsShowingContextMenu())

return;