webkit/support/test_webkit_client.cc - Issue 6990051: Unix ifdefs patch for ui/ and webkit/

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/support/test_webkit_client.cc

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: removed some too general ifdefs and ppapi changes Created 9 years, 7 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: webkit/support/test_webkit_client.cc

diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc

index 8f43e637479038c7290a57d93b65ea344681d0ec..abd5f141077816fb8a5bf41273ae71efd872c91f 100644

--- a/webkit/support/test_webkit_client.cc

+++ b/webkit/support/test_webkit_client.cc

@@ -55,10 +55,10 @@

#if defined(OS_WIN)

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

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

-#elif defined(OS_LINUX)

-#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebThemeEngine.h"

#elif defined(OS_MACOSX)

#include "base/mac/mac_util.h"

+#elif defined(OS_POSIX)

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

#endif

using WebKit::WebScriptController;