components/web_contents_delegate_android/web_contents_delegate_android.h - Issue 1303773002: Give the main frame a RenderWidget.

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: components/web_contents_delegate_android/web_contents_delegate_android.h

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix merge conflicts Created 5 years, 2 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 | « chrome/browser/ui/webui/print_preview/print_preview_distiller.cc ('k') | components/web_contents_delegate_android/web_contents_delegate_android.cc » ('j') | content/browser/frame_host/render_frame_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/web_contents_delegate_android/web_contents_delegate_android.h

diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.h b/components/web_contents_delegate_android/web_contents_delegate_android.h

index c608cad58b5c3b3fd6fb657abec76c2549a219ee..2f22cacf8cb6ab51cfa714821bae0727f6062329 100644

--- a/components/web_contents_delegate_android/web_contents_delegate_android.h

+++ b/components/web_contents_delegate_android/web_contents_delegate_android.h

@@ -75,8 +75,9 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {

content::WebContents* new_contents) override;

bool ShouldCreateWebContents(

content::WebContents* web_contents,

- int route_id,

- int main_frame_route_id,

+ int32_t route_id,

+ int32_t main_frame_route_id,

+ int32_t main_frame_widget_route_id,

WindowContainerType window_container_type,

const std::string& frame_name,

const GURL& target_url,