webkit/tools/test_shell/test_shell_webkit_init.h - Issue 387020: Upstreaming WebKit.gyp

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: webkit/tools/test_shell/test_shell_webkit_init.h

Issue 387020: Upstreaming WebKit.gyp (Closed)

Patch Set: Created 11 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: webkit/tools/test_shell/test_shell_webkit_init.h

diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h

index a360e77a9ff160dd2c535876e4d71fe6a6fc7695..a236c60e82834fdc9fce4af4d3a7dc39ea16cecb 100644

--- a/webkit/tools/test_shell/test_shell_webkit_init.h

+++ b/webkit/tools/test_shell/test_shell_webkit_init.h

@@ -11,16 +11,16 @@

#include "base/stats_counters.h"

#include "base/string_util.h"

#include "media/base/media.h"

-#include "webkit/api/public/WebData.h"

-#include "webkit/api/public/WebRuntimeFeatures.h"

-#include "webkit/api/public/WebKit.h"

-#include "webkit/api/public/WebScriptController.h"

-#include "webkit/api/public/WebSecurityPolicy.h"

-#include "webkit/api/public/WebStorageArea.h"

-#include "webkit/api/public/WebStorageEventDispatcher.h"

-#include "webkit/api/public/WebStorageNamespace.h"

-#include "webkit/api/public/WebString.h"

-#include "webkit/api/public/WebURL.h"

+#include "third_party/WebKit/WebKit/chromium/public/WebData.h"

+#include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h"

+#include "third_party/WebKit/WebKit/chromium/public/WebKit.h"

+#include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h"

+#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h"

+#include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h"

+#include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h"

+#include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h"

+#include "third_party/WebKit/WebKit/chromium/public/WebString.h"

+#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"

#include "webkit/appcache/web_application_cache_host_impl.h"

#include "webkit/database/vfs_backend.h"

#include "webkit/extensions/v8/gears_extension.h"

@@ -36,7 +36,7 @@

#include "v8/include/v8.h"

#if defined(OS_WIN)

-#include "webkit/api/public/win/WebThemeEngine.h"

+#include "third_party/WebKit/WebKit/chromium/public/win/WebThemeEngine.h"

#include "webkit/tools/test_shell/test_shell_webthemeengine.h"

#endif

« no previous file with comments | « webkit/tools/test_shell/test_shell_main.cc ('k') | webkit/tools/test_shell/test_shell_webthemeengine.h » ('j') | no next file with comments »