third_party/WebKit/Source/web/ContextMenuClientImpl.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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: third_party/WebKit/Source/web/ContextMenuClientImpl.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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 | « third_party/WebKit/Source/web/ContextFeaturesClientImpl.cpp ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/ContextMenuClientImpl.cpp

diff --git a/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp b/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp

index 4eead30b47626c40da76b3083f485ddf167d9d11..3dce1b80e9cae8f2f4388c85828b84897346037a 100644

--- a/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp

+++ b/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp

@@ -268,7 +268,7 @@ void ContextMenuClientImpl::showContextMenu(const ContextMenu* defaultMenu)

// It mostly works to convert the security origin to a URL, but

// extensions accessing that property will not get the correct value

// in that case. See https://crbug.com/534561

- WebSecurityOrigin origin = m_webView->mainFrame()->securityOrigin();

+ WebSecurityOrigin origin = m_webView->mainFrame()->getSecurityOrigin();

if (!origin.isNull())

data.pageURL = KURL(ParsedURLString, origin.toString());

} else {