Unix ifdefs patch for ui/ and webkit/

webkit/glue/webkitclient_impl.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_CLIENT_IMPL_H_
 #define WEBKIT_CLIENT_IMPL_H_
 
 #include "base/platform_file.h"
 #include "base/timer.h"
 #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
 
 
 class MessageLoop;
 
 namespace webkit_glue {
 
 class WebKitClientImpl : public WebKit::WebKitClient {
  public:
   WebKitClientImpl();
@@ skipping 55 matching lines @@
   void DoTimeout() {
     if (shared_timer_func_ && !shared_timer_suspended_)
       shared_timer_func_();
   }
 
   MessageLoop* main_loop_;
   base::OneShotTimer<WebKitClientImpl> shared_timer_;
   void (*shared_timer_func_)();
   double shared_timer_fire_time_;
   int shared_timer_suspended_;  // counter
-
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
   WebThemeEngineImpl theme_engine_;
-#endif
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_CLIENT_IMPL_H_