Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: webkit/glue/webkitclient_impl.h

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
Index: webkit/glue/webkitclient_impl.h
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index 0f3765fc3fe520d22e558d8097c1c5ced0243209..81a0e9ce6bafc0968a4c42680e0d329ef31c8835 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -10,10 +10,10 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h"
#if defined(OS_WIN)
#include "webkit/glue/webthemeengine_impl_win.h"
-#elif defined(OS_LINUX)
-#include "webkit/glue/webthemeengine_impl_linux.h"
#elif defined(OS_MACOSX)
#include "webkit/glue/webthemeengine_impl_mac.h"
+#elif defined(OS_POSIX)
+#include "webkit/glue/webthemeengine_impl_linux.h"
#endif
@@ -90,7 +90,7 @@ class WebKitClientImpl : public WebKit::WebKitClient {
double shared_timer_fire_time_;
int shared_timer_suspended_; // counter
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_POSIX)
Lei Zhang 2011/05/24 00:11:32 You might as well remove the #if.
WebThemeEngineImpl theme_engine_;
#endif
};

Powered by Google App Engine
This is Rietveld 408576698