Ignore viewport meta tags when Request Desktop Site is enabled.

content/browser/frame_host/navigation_controller_android.cc

 // Copyright 2013 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/frame_host/navigation_controller_android.h"
 
 #include <stdint.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/render_view_host.h"

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

Why is this header needed? I don't see any new code referencing RenderViewHost.

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

Removed.

 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "jni/NavigationControllerImpl_jni.h"
 #include "net/base/data_url.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
@@ skipping 44 matching lines @@
 }  // namespace
 
 namespace content {
 
 // static
 bool NavigationControllerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 NavigationControllerAndroid::NavigationControllerAndroid(
-    NavigationController* navigation_controller)
+    NavigationControllerImpl* navigation_controller)
     : navigation_controller_(navigation_controller) {
   JNIEnv* env = AttachCurrentThread();
   obj_.Reset(env,
              Java_NavigationControllerImpl_create(
                  env, reinterpret_cast<intptr_t>(this)).obj());
 }
 
 NavigationControllerAndroid::~NavigationControllerAndroid() {
   Java_NavigationControllerImpl_destroy(AttachCurrentThread(), obj_.obj());
 }
@@ skipping 258 matching lines @@
   if (GetUseDesktopUserAgent(env, obj) == enabled)
     return;
 
   // Make sure the navigation entry actually exists.
   NavigationEntry* entry = navigation_controller_->GetVisibleEntry();
   if (!entry)
     return;
 
   // Set the flag in the NavigationEntry.
   entry->SetIsOverridingUserAgent(enabled);
+  navigation_controller_->delegate()->UpdateOverridingUserAgent();
 
   // Send the override to the renderer.
   if (reload_on_state_change) {
     // Reloading the page will send the override down as part of the
     // navigation IPC message.
     navigation_controller_->ReloadOriginalRequestURL(false);
   }
 }
 
 base::android::ScopedJavaLocalRef<jobject>
@@ skipping 60 matching lines @@
     const JavaParamRef<jobject>& obj,
     jlong source_navigation_controller_android,
     jboolean replace_entry) {
   navigation_controller_->CopyStateFromAndPrune(
       reinterpret_cast<NavigationControllerAndroid*>(
           source_navigation_controller_android)->navigation_controller_,
       replace_entry);
 }
 
 }  // namespace content