webkit/glue/webkit_glue.cc - 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/glue/webkit_glue.cc

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:

Index: webkit/glue/webkit_glue.cc

diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc

index d3e5b72004f0402b7b893e3037f17e899c3161eb..85b72b1611f7f700717c5363a3edc08dd6c06bae 100644

--- a/webkit/glue/webkit_glue.cc

+++ b/webkit/glue/webkit_glue.cc

@@ -38,14 +38,14 @@

#include "net/base/escape.h"

#include "skia/ext/platform_canvas.h"

#include "third_party/skia/include/core/SkBitmap.h"

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

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

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

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

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

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

#if defined(OS_WIN)

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

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

#endif

-#include "webkit/api/src/WebFrameImpl.h"

-#include "webkit/api/src/WebViewImpl.h"

+#include "third_party/WebKit/WebKit/chromium/src/WebFrameImpl.h"

+#include "third_party/WebKit/WebKit/chromium/src/WebViewImpl.h"

#include "webkit/glue/glue_serialize.h"

#include "webkit/glue/glue_util.h"

« no previous file with comments | « webkit/glue/webkit_glue.h ('k') | webkit/glue/webkitclient_impl.h » ('j') | no next file with comments »