Commit cfe438d5 authored by tedchoc's avatar tedchoc Committed by Commit bot

Expose the page URL to the java context menu params.

BUG=481801

Review URL: https://codereview.chromium.org/1113723002

Cr-Commit-Position: refs/heads/master@{#327422}
parent 203a1880
......@@ -39,6 +39,7 @@ public class ContextMenuParams {
}
}
private final String mPageUrl;
private final String mLinkUrl;
private final String mLinkText;
private final String mUnfilteredLinkUrl;
......@@ -87,6 +88,13 @@ public class ContextMenuParams {
return mCustomMenuItems.get(index).action;
}
/**
* @return The URL associated with the main frame of the page that triggered the context menu.
*/
public String getPageUrl() {
return mPageUrl;
}
/**
* @return The link URL, if any.
*/
......@@ -157,9 +165,10 @@ public class ContextMenuParams {
return mIsVideo;
}
private ContextMenuParams(int mediaType, String linkUrl, String linkText,
private ContextMenuParams(int mediaType, String pageUrl, String linkUrl, String linkText,
String unfilteredLinkUrl, String srcUrl, String selectionText, boolean isEditable,
Referrer referrer) {
mPageUrl = pageUrl;
mLinkUrl = linkUrl;
mLinkText = linkText;
mUnfilteredLinkUrl = unfilteredLinkUrl;
......@@ -174,13 +183,13 @@ public class ContextMenuParams {
}
@CalledByNative
private static ContextMenuParams create(int mediaType, String linkUrl, String linkText,
String unfilteredLinkUrl, String srcUrl, String selectionText, boolean isEditable,
String sanitizedReferrer, int referrerPolicy) {
private static ContextMenuParams create(int mediaType, String pageUrl, String linkUrl,
String linkText, String unfilteredLinkUrl, String srcUrl, String selectionText,
boolean isEditable, String sanitizedReferrer, int referrerPolicy) {
Referrer referrer = TextUtils.isEmpty(sanitizedReferrer)
? null : new Referrer(sanitizedReferrer, referrerPolicy);
return new ContextMenuParams(mediaType, linkUrl, linkText, unfilteredLinkUrl, srcUrl,
selectionText, isEditable, referrer);
return new ContextMenuParams(mediaType, pageUrl, linkUrl, linkText, unfilteredLinkUrl,
srcUrl, selectionText, isEditable, referrer);
}
@CalledByNative
......
......@@ -80,6 +80,7 @@ ContextMenuHelper::CreateJavaContextMenuParams(
ContextMenuParamsAndroid::Java_ContextMenuParams_create(
env,
params.media_type,
ConvertUTF8ToJavaString(env, params.page_url.spec()).obj(),
ConvertUTF8ToJavaString(env, params.link_url.spec()).obj(),
ConvertUTF16ToJavaString(env, params.link_text).obj(),
ConvertUTF8ToJavaString(env, params.unfiltered_link_url.spec()).obj(),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment