Call setUseMobileViewportStyle before setViewportEnabled

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 1039 matching lines @@
 
   settings->setUnsafePluginPastingEnabled(false);
   settings->setEditingBehavior(
       static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior));
 
   settings->setSupportsMultipleWindows(prefs.supports_multiple_windows);
 
   // TODO(bokan): Remove once Blink side is gone.
   settings->setInvertViewportScrollOrder(true);
 
+#if defined(OS_ANDROID)
+  settings->setUseMobileViewportStyle(true);
+#endif
   settings->setViewportEnabled(prefs.viewport_enabled);

[bokan, 2015/10/08 15:03:47]

How about moving this block (viewportEnabled to MainFrameResizes...) of settings
down below the OS_ANDROID ifdef? A quick look at the side-effects seems like
that should work too and would avoid splitting the Android specific calls.

   settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
   settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
   settings->setMainFrameResizesAreOrientationChanges(
       prefs.main_frame_resizes_are_orientation_changes);
 
   settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled);
 
   settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled);
 
   settings->setSelectionIncludesAltImageText(true);
@@ skipping 40 matching lines @@
       prefs.viewport_meta_zero_values_quirk);
   settings->setClobberUserAgentInitialScaleQuirk(
       prefs.clobber_user_agent_initial_scale_quirk);
   settings->setIgnoreMainFrameOverflowHiddenQuirk(
       prefs.ignore_main_frame_overflow_hidden_quirk);
   settings->setReportScreenSizeInPhysicalPixelsQuirk(
       prefs.report_screen_size_in_physical_pixels_quirk);
   settings->setPreferHiddenVolumeControls(true);
   settings->setMainFrameClipsContent(!prefs.record_whole_document);
   settings->setShrinksViewportContentToFit(true);
-  settings->setUseMobileViewportStyle(true);
   settings->setAutoplayExperimentMode(
       blink::WebString::fromUTF8(prefs.autoplay_experiment_mode));
 #endif
 
   WebNetworkStateNotifier::setOnLine(prefs.is_online);
   WebNetworkStateNotifier::setWebConnection(
       NetConnectionTypeToWebConnectionType(prefs.net_info_connection_type),
       prefs.net_info_max_bandwidth_mbps);
 
   settings->setPinchOverlayScrollbarThickness(
@@ skipping 2609 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content