android_webview/native/aw_settings.cc - Issue 191093002: Simplify the user agent code some more since after r255534 it's not affected by the site's URL.

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: android_webview/native/aw_settings.cc

Issue 191093002: Simplify the user agent code some more since after r255534 it's not affected by the site's URL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: patchset 15 which works Created 6 years, 9 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

Index: android_webview/native/aw_settings.cc

===================================================================

--- android_webview/native/aw_settings.cc (revision 255867)

+++ android_webview/native/aw_settings.cc (working copy)

@@ -5,6 +5,7 @@

#include "android_webview/native/aw_settings.h"

#include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"

+#include "android_webview/common/aw_content_client.h"

#include "android_webview/native/aw_contents.h"

#include "base/android/jni_android.h"

#include "base/android/jni_string.h"

@@ -14,10 +15,8 @@

#include "content/public/browser/navigation_entry.h"

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/web_contents.h"

-#include "content/public/common/content_client.h"

#include "content/public/common/content_switches.h"

#include "jni/AwSettings_jni.h"

-#include "webkit/common/user_agent/user_agent.h"

#include "webkit/common/webpreferences.h"

using base::android::ConvertJavaStringToUTF16;

@@ -341,8 +340,7 @@

}

static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {

- return base::android::ConvertUTF8ToJavaString(

- env, content::GetUserAgent(GURL())).Release();

+ return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()).Release();

}

bool RegisterAwSettings(JNIEnv* env) {

« no previous file with comments | « android_webview/common/aw_content_client.cc ('k') | chrome/browser/autofill/risk/fingerprint_browsertest.cc » ('j') | no next file with comments »