content/browser/android/content_settings.cc - Issue 10869073: Split user agent code out of the 'glue' target

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/android/content_settings.cc

Issue 10869073: Split user agent code out of the 'glue' target (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to trunk Created 8 years, 3 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:

Index: content/browser/android/content_settings.cc

diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc

index a89a10df5dbab08c706fa2c1300e9fb7e8b68b91..63f32b8f64176aff94e2ea70dee13960eb6db734 100644

--- a/content/browser/android/content_settings.cc

+++ b/content/browser/android/content_settings.cc

@@ -11,9 +11,10 @@

#include "content/browser/renderer_host/render_view_host_impl.h"

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

#include "jni/ContentSettings_jni.h"

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

#include "webkit/glue/webkit_glue.h"

#include "webkit/glue/webpreferences.h"

+#include "webkit/user_agent/user_agent.h"

+#include "webkit/user_agent/user_agent_util.h"

using base::android::CheckException;

using base::android::ConvertJavaStringToUTF16;