Ignore viewport meta tags when Request Desktop Site is enabled.

content/browser/web_contents/web_contents_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/browser/web_contents/web_contents_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 2168 matching lines @@
 }
 
 void WebContentsImpl::SetIsVirtualKeyboardRequested(bool requested) {
   virtual_keyboard_requested_ = requested;
 }
 
 bool WebContentsImpl::IsVirtualKeyboardRequested() {
   return virtual_keyboard_requested_;
 }
 
+bool WebContentsImpl::IsOverridingUserAgent() {
+  return GetController().GetVisibleEntry() &&
+         GetController().GetVisibleEntry()->GetIsOverridingUserAgent();
+}
+
 AccessibilityMode WebContentsImpl::GetAccessibilityMode() const {
   return accessibility_mode_;
 }
 
 void WebContentsImpl::AccessibilityEventReceived(
     const std::vector<AXEventNotificationDetails>& details) {
   FOR_EACH_OBSERVER(
       WebContentsObserver, observers_, AccessibilityEventReceived(details));
 }
 
@@ skipping 2684 matching lines @@
   }
   if (visible == should_normally_be_visible_)
     return;
 
   if (visible)
     WasShown();
   else
     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;
 }
 
 }  // namespace content