chrome/renderer/render_thread.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: chrome/renderer/render_thread.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: chrome/renderer/render_thread.cc

diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc

index 8f3bac585305877f871a3bd44bffa4ee28e47191..bc9494d27c88fbb2748ba3941755da621ad0e8e2 100644

--- a/chrome/renderer/render_thread.cc

+++ b/chrome/renderer/render_thread.cc

@@ -57,17 +57,17 @@

#include "chrome/renderer/user_script_slave.h"

#include "ipc/ipc_message.h"

#include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+#include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.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/WebStorageEventDispatcher.h"

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

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

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

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

« no previous file with comments | « chrome/renderer/print_web_view_helper_win.cc ('k') | chrome/renderer/render_view.h » ('j') | no next file with comments »