content/browser/web_contents/web_contents_impl.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/web_contents/web_contents_impl.cc

Issue 357203003: Move webpreferences.* from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: android fix - webview() -> web_view Created 6 years, 5 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/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 02331996278b9fe1ed534d04604a211b0d6641c4..a2ca1928583af04d5f3174fdabda2be6aa61ab1a 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -84,6 +84,7 @@

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

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

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

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

#include "net/base/mime_util.h"

#include "net/base/net_util.h"

#include "net/http/http_cache.h"

@@ -94,7 +95,6 @@

#include "ui/gfx/display.h"

#include "ui/gfx/screen.h"

#include "ui/gl/gl_switches.h"

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

#if defined(OS_ANDROID)

#include "content/browser/android/content_view_core_impl.h"