content/browser/frame_host/navigation_controller_android.cc - Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/frame_host/navigation_controller_android.cc

Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use std::set Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/frame_host/navigation_controller_android.h ('k') | content/browser/frame_host/navigation_controller_delegate.h » ('j') | content/browser/web_contents/web_contents_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigation_controller_android.cc

diff --git a/content/browser/frame_host/navigation_controller_android.cc b/content/browser/frame_host/navigation_controller_android.cc

index 96aceacc0708c7c7219ea3cbe3a87fc38b7c966f..840771550f493682f02002173b6392b3187a9e8a 100644

--- a/content/browser/frame_host/navigation_controller_android.cc

+++ b/content/browser/frame_host/navigation_controller_android.cc

@@ -9,9 +9,9 @@

#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/ssl_host_state_delegate.h"

#include "jni/NavigationControllerImpl_jni.h"

#include "net/base/data_url.h"

@@ -76,7 +76,7 @@ bool NavigationControllerAndroid::Register(JNIEnv* env) {

}

NavigationControllerAndroid::NavigationControllerAndroid(

- NavigationController* navigation_controller)

+ NavigationControllerImpl* navigation_controller)

: navigation_controller_(navigation_controller) {

JNIEnv* env = AttachCurrentThread();

obj_.Reset(env,

@@ -355,6 +355,7 @@ void NavigationControllerAndroid::SetUseDesktopUserAgent(

// Set the flag in the NavigationEntry.

entry->SetIsOverridingUserAgent(enabled);

+ navigation_controller_->delegate()->UpdateOverridingUserAgent();

// Send the override to the renderer.

if (reload_on_state_change) {