Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1177)

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: Change loop style 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
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 f4891f2d4043a6e5f8e4324337b25446c85f4cda..c0a10a5bf61d75e68da7bad372805dc35d96fd7a 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);
« no previous file with comments | « content/browser/renderer_host/render_view_host_delegate.cc ('k') | content/browser/web_contents/web_contents_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698