Cleanup: USE_X11 + OS_MACOSX = OS_POSIX.

gfx/native_widget_types.h

 // Copyright (c) 2010 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 GFX_NATIVE_WIDGET_TYPES_H_
 #define GFX_NATIVE_WIDGET_TYPES_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
@@ skipping 19 matching lines @@
 //     specific typedef.
 //
 //   NativeImage: The platform-specific image type used for drawing UI elements
 //     in the browser.
 //
 // The name 'View' here meshes with OS X where the UI elements are called
 // 'views' and with our Chrome UI code where the elements are also called
 // 'views'.
 
 #if defined(OS_WIN)
-#include <windows.h>
+#include <windows.h>  // NOLINT
 typedef struct HFONT__* HFONT;
 #elif defined(OS_MACOSX)
 struct CGContext;
 #ifdef __OBJC__
 @class NSFont;
 @class NSImage;
 @class NSView;
 @class NSWindow;
 @class NSTextField;
 #else
@@ skipping 62 matching lines @@
 
 #if defined(OS_WIN)
 // Convert a NativeViewId to a NativeView.
 //
 // On Windows, we pass an HWND into the renderer. As stated above, the renderer
 // should not be performing operations on the view.
 static inline NativeView NativeViewFromId(NativeViewId id) {
   return reinterpret_cast<NativeView>(id);
 }
 #define NativeViewFromIdInBrowser(x) NativeViewFromId(x)
-#elif defined(OS_MACOSX) || defined(USE_X11)
+#elif defined(OS_POSIX)
 // On Mac and Linux, a NativeView is a pointer to an object, and is useless
 // outside the process in which it was created. NativeViewFromId should only be
 // used inside the appropriate platform ifdef outside of the browser.
 // (NativeViewFromIdInBrowser can be used everywhere in the browser.) If your
 // cross-platform design involves a call to NativeViewFromId from outside the
 // browser it will never work on Mac or Linux and is fundamentally broken.
 
 // Please do not call this from outside the browser. It won't work; the name
 // should give you a subtle hint.
 static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) {
   return reinterpret_cast<NativeView>(id);
 }
-#endif  // defined(OS_MACOSX) || defined(USE_X11)
+#endif  // defined(OS_POSIX)
 
 // Convert a NativeView to a NativeViewId.  See the comments at the top of
 // this file.
 #if defined(OS_WIN) || defined(OS_MACOSX)
 static inline NativeViewId IdFromNativeView(NativeView view) {
   return reinterpret_cast<NativeViewId>(view);
 }
 #elif defined(USE_X11)
 // Not inlined because it involves pulling too many headers.
 NativeViewId IdFromNativeView(NativeView view);
@@ skipping 20 matching lines @@
   // GPU plugin becomes a full-on GPU process, this typedef can be
   // returned to a bool. For now we use a type large enough to hold a
   // pointer on 64-bit architectures in case we need this capability.
   typedef uint64 PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #endif
 
 }  // namespace gfx
 
 #endif  // GFX_NATIVE_WIDGET_TYPES_H_