Unix ifdefs patch for ui/ and webkit/

ui/gfx/gl/gl_surface_egl.cc

 // 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.
 
 #include "ui/gfx/gl/gl_surface_egl.h"
 
 #include "build/build_config.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/angle/include/EGL/egl.h"
 #include "ui/gfx/gl/egl_util.h"
 
 // This header must come after the above third-party include, as
 // it brings in #defines that cause conflicts.
 #include "ui/gfx/gl/gl_bindings.h"
 
-#if defined(OS_LINUX)
+#if defined(USE_X11)
 extern "C" {
 #include <X11/Xlib.h>
 }
 #endif
 
 namespace gfx {
 
 namespace {
 EGLConfig g_config;
 EGLDisplay g_display;
 }
 
 GLSurfaceEGL::GLSurfaceEGL() {
 }
 
 GLSurfaceEGL::~GLSurfaceEGL() {
 }
 
 bool GLSurfaceEGL::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
-#ifdef OS_LINUX
+#if defined(USE_X11)
   EGLNativeDisplayType native_display = XOpenDisplay(NULL);
 #else
   EGLNativeDisplayType native_display = EGL_DEFAULT_DISPLAY;
 #endif
   g_display = eglGetDisplay(native_display);
   if (!g_display) {
     LOG(ERROR) << "eglGetDisplay failed with error " << GetLastEGLErrorString();
     return false;
   }
 
@@ skipping 179 matching lines @@
 
 gfx::Size PbufferGLSurfaceEGL::GetSize() {
   return size_;
 }
 
 EGLSurface PbufferGLSurfaceEGL::GetHandle() {
   return surface_;
 }
 
 }  // namespace gfx