chrome/browser/extensions/extension_webkit_preferences.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: chrome/browser/extensions/extension_webkit_preferences.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: chrome/browser/extensions/extension_webkit_preferences.cc

diff --git a/chrome/browser/extensions/extension_webkit_preferences.cc b/chrome/browser/extensions/extension_webkit_preferences.cc

index afcc86c38e98a4647cefafab84f48a0a996368c1..73ce8c33e0536b2379068dc8f6d114693041c393 100644

--- a/chrome/browser/extensions/extension_webkit_preferences.cc

+++ b/chrome/browser/extensions/extension_webkit_preferences.cc

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

#include "base/command_line.h"

#include "chrome/common/chrome_switches.h"

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

#include "extensions/common/extension.h"

#include "extensions/common/manifest.h"

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

namespace extension_webkit_preferences {

void SetPreferences(const extensions::Extension* extension,

extensions::ViewType render_view_type,

- WebPreferences* webkit_prefs) {

+ content::WebPreferences* webkit_prefs) {

if (!extension)

return;