content/shell/shell_web_contents_view_delegate_mac.mm - Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods.

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: content/shell/shell_web_contents_view_delegate_mac.mm

Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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:

Index: content/shell/shell_web_contents_view_delegate_mac.mm

diff --git a/content/shell/shell_web_contents_view_delegate_mac.mm b/content/shell/shell_web_contents_view_delegate_mac.mm

index 7143e16b8c87d507cd6eab126280baab537e692a..246059517f2ebd1176eda768ed2a13ead671bb0b 100644

--- a/content/shell/shell_web_contents_view_delegate_mac.mm

+++ b/content/shell/shell_web_contents_view_delegate_mac.mm

@@ -201,7 +201,7 @@ void ShellWebContentsViewDelegate::ShowContextMenu(

YES,

delegate);

- NSView* parent_view = web_contents_->GetContentNativeView();

+ NSView* parent_view = web_contents_->GetView()->GetContentNativeView();

NSEvent* currentEvent = [NSApp currentEvent];

NSWindow* window = [parent_view window];

NSPoint position = [window mouseLocationOutsideOfEventStream];

@@ -248,15 +248,15 @@ void ShellWebContentsViewDelegate::ActionPerformed(int tag) {

}

case ShellContextMenuItemBackTag:

web_contents_->GetController().GoToOffset(-1);

- web_contents_->Focus();

+ web_contents_->GetView()->Focus();

break;

case ShellContextMenuItemForwardTag:

web_contents_->GetController().GoToOffset(1);

- web_contents_->Focus();

+ web_contents_->GetView()->Focus();

break;

case ShellContextMenuItemReloadTag: {

web_contents_->GetController().Reload(false);

- web_contents_->Focus();

+ web_contents_->GetView()->Focus();

break;

}

case ShellContextMenuItemInspectTag: {