Replace OS_LINUX ifdefs with OS_POSIX & !OS_MACOSX, TOOLKIT_USES_GTK, or

content/browser/gpu/gpu_process_host_ui_shim.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 "content/browser/gpu/gpu_process_host_ui_shim.h"
 
 #include "base/id_map.h"
 #include "base/process_util.h"
 #include "base/debug/trace_event.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/gpu/gpu_data_manager.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/gpu/gpu_messages.h"
 
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
 // These two #includes need to come after gpu_messages.h.
 #include <gdk/gdkwindow.h>  // NOLINT
 #include <gdk/gdkx.h>  // NOLINT
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/size.h"
-#endif  // defined(OS_LINUX)
+#endif
 namespace {
 
 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
 #endif
 
 IDMap<GpuProcessHostUIShim> g_hosts_by_id;
 
 class SendOnIOThreadTask : public Task {
@@ skipping 103 matching lines @@
   g_hosts_by_id.Remove(host_id_);
 }
 
 bool GpuProcessHostUIShim::OnControlMessageReceived(
     const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
 
   IPC_BEGIN_MESSAGE_MAP(GpuProcessHostUIShim, message)
     IPC_MESSAGE_HANDLER(GpuHostMsg_OnLogMessage,
                         OnLogMessage)
-#if defined(OS_LINUX) && !defined(TOUCH_UI) || defined(OS_WIN)
+#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) || defined(OS_WIN)
     IPC_MESSAGE_HANDLER(GpuHostMsg_ResizeView, OnResizeView)
 #elif defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceSetIOSurface,
                         OnAcceleratedSurfaceSetIOSurface)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
                         OnAcceleratedSurfaceBuffersSwapped)
 #endif
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
 
   return true;
 }
 
 void GpuProcessHostUIShim::OnLogMessage(
     int level,
     const std::string& header,
     const std::string& message) {
   DictionaryValue* dict = new DictionaryValue();
   dict->SetInteger("level", level);
   dict->SetString("header", header);
   dict->SetString("message", message);
   GpuDataManager::GetInstance()->AddLogMessage(dict);
 }
 
-#if defined(OS_LINUX) && !defined(TOUCH_UI) || defined(OS_WIN)
+#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) || defined(OS_WIN)
 
 void GpuProcessHostUIShim::OnResizeView(int32 renderer_id,
                                         int32 render_view_id,
                                         int32 command_buffer_route_id,
                                         gfx::Size size) {
   RenderViewHost* host = RenderViewHost::FromID(renderer_id, render_view_id);
   if (host) {
     RenderWidgetHostView* view = host->view();
     if (view) {
       gfx::PluginWindowHandle handle = view->GetCompositingSurface();
 
       // Resize the window synchronously. The GPU process must not issue GL
       // calls on the command buffer until the window is the size it expects it
       // to be.
-#if defined(OS_LINUX) && !defined(TOUCH_UI)
+#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI)
       GdkWindow* window = reinterpret_cast<GdkWindow*>(
           gdk_xid_table_lookup(handle));
       if (window) {
         Display* display = GDK_WINDOW_XDISPLAY(window);
         gdk_window_resize(window, size.width(), size.height());
         XSync(display, False);
       }
 #elif defined(OS_WIN)
       SetWindowPos(handle,
           NULL,
@@ skipping 45 matching lines @@
       params.window,
       params.surface_id,
       // Parameters needed to formulate an acknowledgment.
       params.renderer_id,
       params.route_id,
       host_id_,
       params.swap_buffers_count);
 }
 
 #endif