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 354035050a0d079d2a73a0d79796655544f2bafe..7b2e481dc9b9a27f6319e22a8d7578d299e64fa9 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2176,6 +2176,11 @@ bool WebContentsImpl::IsVirtualKeyboardRequested() {
   return virtual_keyboard_requested_;
 }
 
+bool WebContentsImpl::IsOverridingUserAgent() {
+  return GetController().GetVisibleEntry() &&
+         GetController().GetVisibleEntry()->GetIsOverridingUserAgent();
+}
+
 AccessibilityMode WebContentsImpl::GetAccessibilityMode() const {
   return accessibility_mode_;
 }
@@ -4847,6 +4852,19 @@ void WebContentsImpl::UpdateWebContentsVisibility(bool visible) {
     WasHidden();
 }
 
+void WebContentsImpl::UpdateOverridingUserAgent() {
+  for (FrameTreeNode* node : frame_tree_.Nodes()) {
+    RenderWidgetHost* render_widget_host =
+        node->current_frame_host()->GetRenderWidgetHost();
+    if (!render_widget_host)
+      continue;
+    RenderViewHost* render_view_host = RenderViewHost::From(render_widget_host);
+    if (!render_view_host)
+      continue;
+    render_view_host->OnWebkitPreferencesChanged();

[nasko, 2016/04/08 22:32:35]

It will be more efficient to add the RenderViewHost pointers you get to a
std::set, as it is likely that more than one FrameTreeNode will share
RenderViewHost. This will avoid sending multiple updates to the same RenderView.

[aelias_OOO_until_Jul13, 2016/04/08 23:31:36]

Done.

+  }
+}
+
 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
     JavaScriptDialogManager* dialog_manager) {
   dialog_manager_ = dialog_manager;