content/shell/browser/shell_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: content/shell/browser/shell_content_browser_client.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/shell/browser/shell_content_browser_client.cc

diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc

index 83fe76f20b3e1e5e7ce0425294d6de0c1d025790..560cef1dfa14251596a4f3e23c1e04bf92320947 100644

--- a/content/shell/browser/shell_content_browser_client.cc

+++ b/content/shell/browser/shell_content_browser_client.cc

@@ -15,6 +15,7 @@

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

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

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

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

#include "content/shell/browser/shell.h"

#include "content/shell/browser/shell_browser_context.h"

#include "content/shell/browser/shell_browser_main_parts.h"

@@ -31,7 +32,6 @@

#include "content/shell/geolocation/shell_access_token_store.h"

#include "net/url_request/url_request_context_getter.h"

#include "url/gurl.h"

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

#if defined(OS_ANDROID)

#include "base/android/path_utils.h"

« no previous file with comments | « content/renderer/web_preferences.cc ('k') | content/shell/browser/webkit_test_controller.h » ('j') | no next file with comments »