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 { ...@@ -39,6 +39,7 @@ public class ContextMenuParams {
} }
} }
private final String mPageUrl;
private final String mLinkUrl; private final String mLinkUrl;
private final String mLinkText; private final String mLinkText;
private final String mUnfilteredLinkUrl; private final String mUnfilteredLinkUrl;
...@@ -87,6 +88,13 @@ public class ContextMenuParams { ...@@ -87,6 +88,13 @@ public class ContextMenuParams {
return mCustomMenuItems.get(index).action; 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. * @return The link URL, if any.
*/ */
...@@ -157,9 +165,10 @@ public class ContextMenuParams { ...@@ -157,9 +165,10 @@ public class ContextMenuParams {
return mIsVideo; 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, String unfilteredLinkUrl, String srcUrl, String selectionText, boolean isEditable,
Referrer referrer) { Referrer referrer) {
mPageUrl = pageUrl;
mLinkUrl = linkUrl; mLinkUrl = linkUrl;
mLinkText = linkText; mLinkText = linkText;
mUnfilteredLinkUrl = unfilteredLinkUrl; mUnfilteredLinkUrl = unfilteredLinkUrl;
...@@ -174,13 +183,13 @@ public class ContextMenuParams { ...@@ -174,13 +183,13 @@ public class ContextMenuParams {
} }
@CalledByNative @CalledByNative
private static ContextMenuParams create(int mediaType, String linkUrl, String linkText, private static ContextMenuParams create(int mediaType, String pageUrl, String linkUrl,
String unfilteredLinkUrl, String srcUrl, String selectionText, boolean isEditable, String linkText, String unfilteredLinkUrl, String srcUrl, String selectionText,
String sanitizedReferrer, int referrerPolicy) { boolean isEditable, String sanitizedReferrer, int referrerPolicy) {
Referrer referrer = TextUtils.isEmpty(sanitizedReferrer) Referrer referrer = TextUtils.isEmpty(sanitizedReferrer)
? null : new Referrer(sanitizedReferrer, referrerPolicy); ? null : new Referrer(sanitizedReferrer, referrerPolicy);
return new ContextMenuParams(mediaType, linkUrl, linkText, unfilteredLinkUrl, srcUrl, return new ContextMenuParams(mediaType, pageUrl, linkUrl, linkText, unfilteredLinkUrl,
selectionText, isEditable, referrer); srcUrl, selectionText, isEditable, referrer);
} }
@CalledByNative @CalledByNative
......
...@@ -80,6 +80,7 @@ ContextMenuHelper::CreateJavaContextMenuParams( ...@@ -80,6 +80,7 @@ ContextMenuHelper::CreateJavaContextMenuParams(
ContextMenuParamsAndroid::Java_ContextMenuParams_create( ContextMenuParamsAndroid::Java_ContextMenuParams_create(
env, env,
params.media_type, params.media_type,
ConvertUTF8ToJavaString(env, params.page_url.spec()).obj(),
ConvertUTF8ToJavaString(env, params.link_url.spec()).obj(), ConvertUTF8ToJavaString(env, params.link_url.spec()).obj(),
ConvertUTF16ToJavaString(env, params.link_text).obj(), ConvertUTF16ToJavaString(env, params.link_text).obj(),
ConvertUTF8ToJavaString(env, params.unfiltered_link_url.spec()).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