android_webview/browser/aw_content_browser_client.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: android_webview/browser/aw_content_browser_client.cc

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

Patch Set: missed a comma - fix android_webview 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: android_webview/browser/aw_content_browser_client.cc

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc

index 9181ce5df4954663973b7ba38fbe6e80a4dca65e..a07c3823edb6a5a70c485b879937d3763fd2eb44 100644

--- a/android_webview/browser/aw_content_browser_client.cc

+++ b/android_webview/browser/aw_content_browser_client.cc

@@ -28,15 +28,16 @@

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

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

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

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

#include "grit/ui_resources.h"

#include "net/android/network_library.h"

#include "net/ssl/ssl_cert_request_info.h"

#include "net/ssl/ssl_info.h"

#include "ui/base/l10n/l10n_util_android.h"

#include "ui/base/resource/resource_bundle.h"

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

using content::BrowserThread;

+using content::WebPreferences;

namespace android_webview {

namespace {