Ignore viewport meta tags when Request Desktop Site is enabled.

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 61d8bf355896c030edd1856e8799235f77226820..f2b21dde56328f617a924052d4fe89f0952f6486 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2186,6 +2186,11 @@ bool WebContentsImpl::IsVirtualKeyboardRequested() {
   return virtual_keyboard_requested_;
 }
 
+bool WebContentsImpl::IsOverridingUserAgent() {
+  return GetController().GetVisibleEntry() &&
+         GetController().GetVisibleEntry()->GetIsOverridingUserAgent();
+}
+
 AccessibilityMode WebContentsImpl::GetAccessibilityMode() const {
   return accessibility_mode_;
 }
@@ -4890,6 +4895,18 @@ void WebContentsImpl::UpdateWebContentsVisibility(bool visible) {
     WasHidden();
 }
 
+void WebContentsImpl::UpdateOverridingUserAgent() {
+  std::set<RenderViewHost*> render_view_host_set;
+  for (FrameTreeNode* node : frame_tree_.Nodes())

[nasko, 2016/04/09 00:02:26]

Multiline for loop should have {}.

+    if (RenderWidgetHost* render_widget_host =

[nasko, 2016/04/09 00:02:26]

Style in this file is to have variable declaration on a line separate from the
check. It will also allow you to continue; easily if the check fails.

+            node->current_frame_host()->GetRenderWidgetHost())
+      if (RenderViewHost* render_view_host =
+              RenderViewHost::From(render_widget_host))
+        render_view_host_set.insert(render_view_host);
+  for (RenderViewHost* render_view_host : render_view_host_set)
+    render_view_host->OnWebkitPreferencesChanged();
+}
+
 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
     JavaScriptDialogManager* dialog_manager) {
   dialog_manager_ = dialog_manager;