content/shell/browser/webkit_test_controller.h - 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/webkit_test_controller.h

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/shell/browser/webkit_test_controller.h

diff --git a/content/shell/browser/webkit_test_controller.h b/content/shell/browser/webkit_test_controller.h

index dfae5bd7bd1804e7f6c5cfe1185b0ef50357a91a..51a9a65d60a37d731342c1b8ad75708f888052c2 100644

--- a/content/shell/browser/webkit_test_controller.h

+++ b/content/shell/browser/webkit_test_controller.h

@@ -16,9 +16,9 @@

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

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

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

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

#include "content/shell/common/leak_detection_result.h"

#include "ui/gfx/size.h"

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

#if defined(OS_ANDROID)

#include "base/threading/thread_restrictions.h"