content/browser/renderer_host/render_view_host_impl.cc - Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled.

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: content/browser/renderer_host/render_view_host_impl.cc

Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Call delegate() directly from NavigationControllerAndroid Created 4 years, 8 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

« content/browser/frame_host/navigation_controller_android.cc ('K') | « content/browser/renderer_host/render_view_host_delegate.cc ('k') | content/browser/web_contents/web_contents_android.h » ('j') | content/browser/web_contents/web_contents_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_view_host_impl.cc

diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc

index a26e5841ed080501ffdc36a023cea8a21701e0a2..7c415fce9b82a0607669dfd1fd41bdc5c40e764f 100644

--- a/content/browser/renderer_host/render_view_host_impl.cc

+++ b/content/browser/renderer_host/render_view_host_impl.cc

@@ -491,9 +491,10 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() {

prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors();

- prefs.viewport_enabled =

- command_line.HasSwitch(switches::kEnableViewport) ||

- prefs.viewport_meta_enabled;

+ prefs.viewport_enabled = command_line.HasSwitch(switches::kEnableViewport);

+ if (delegate_ && delegate_->IsOverridingUserAgent())

+ prefs.viewport_meta_enabled = false;

prefs.main_frame_resizes_are_orientation_changes =

command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges);