diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 16:15:07 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 16:15:07 +0000 |
| commit | a7531d77403f524dab3446a013f2633450fcf449 (patch) | |
| tree | 81d12527fd41e6dff338857d0d96594b936db080 /android_webview | |
| parent | 60875d44ae771fb8654b31a50e69b27e9af4c05e (diff) | |
| download | chromium_src-a7531d77403f524dab3446a013f2633450fcf449.zip chromium_src-a7531d77403f524dab3446a013f2633450fcf449.tar.gz chromium_src-a7531d77403f524dab3446a013f2633450fcf449.tar.bz2 | |
Get rid of ContextMenuParams::frame_id since on the browser side we know which RFH this is for.
Although it was called frame_id, it had been changed to be a RenderFrame's routing id. RetargetingDetails still uses the ID. It's combined with a RVH so it's unique even with OOPIF. We will have to later on change FrameNavigationState to stop using RVH.
R=creis@chromium.org
Review URL: https://codereview.chromium.org/207353003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/native/aw_web_contents_delegate.cc | 2 | ||||
| -rw-r--r-- | android_webview/native/aw_web_contents_delegate.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/native/aw_web_contents_delegate.cc b/android_webview/native/aw_web_contents_delegate.cc index 75db194..3c5c40e 100644 --- a/android_webview/native/aw_web_contents_delegate.cc +++ b/android_webview/native/aw_web_contents_delegate.cc @@ -163,7 +163,7 @@ void AwWebContentsDelegate::AddNewContents(WebContents* source, // typically happens when popups are created. void AwWebContentsDelegate::WebContentsCreated( WebContents* source_contents, - int64 source_frame_id, + int opener_render_frame_id, const base::string16& frame_name, const GURL& target_url, content::WebContents* new_contents) { diff --git a/android_webview/native/aw_web_contents_delegate.h b/android_webview/native/aw_web_contents_delegate.h index ca42459..6f444a7 100644 --- a/android_webview/native/aw_web_contents_delegate.h +++ b/android_webview/native/aw_web_contents_delegate.h @@ -42,7 +42,7 @@ class AwWebContentsDelegate bool* was_blocked) OVERRIDE; virtual void WebContentsCreated(content::WebContents* source_contents, - int64 source_frame_id, + int opener_render_frame_id, const base::string16& frame_name, const GURL& target_url, content::WebContents* new_contents) OVERRIDE; |