content/browser/android/content_settings.cc - Issue 357203003: Move webpreferences.* from webkit/ to content/

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 357203003: Move webpreferences.* from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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 a83169c2ce9dc53161b9421443da58c9da55325a..5549639c4d04797b0307c45a08c628bd320c9481 100644

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

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

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

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

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

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

+#include "content/public/common/webpreferences.h"

#include "jni/ContentSettings_jni.h"

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

namespace content {