aura: Make 'ui' buildable without gtk.

ui/gfx/rect.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.
 
 // Defines a simple integer rectangle class.  The containment semantics
 // are array-like; that is, the coordinate (x, y) is considered to be
 // contained by the rectangle, but the coordinate (x + width, y) is not.
 // The class will happily let you create malformed rectangles (that is,
 // rectangles with negative width and/or height), but there will be assertions
 // in the operations (such as Contains()) to complain in this case.
 
 #ifndef UI_GFX_RECT_H_
 #define UI_GFX_RECT_H_
 #pragma once
 
 #include <iosfwd>
 
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
 #if defined(OS_WIN)
 typedef struct tagRECT RECT;
-#elif defined(USE_X11)
+#elif defined(TOOLKIT_USES_GTK)
 typedef struct _GdkRectangle GdkRectangle;
 #endif
 
 #if defined(USE_WAYLAND)
 typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
 #endif
 
 namespace gfx {
 
 class Insets;
 
 class UI_EXPORT Rect {
  public:
   Rect();
   Rect(int width, int height);
   Rect(int x, int y, int width, int height);
 #if defined(OS_WIN)
   explicit Rect(const RECT& r);
 #elif defined(OS_MACOSX)
   explicit Rect(const CGRect& r);
-#elif defined(USE_X11)
+#elif defined(TOOLKIT_USES_GTK)
   explicit Rect(const GdkRectangle& r);
 #endif
 #if defined(USE_WAYLAND)
   explicit Rect(const cairo_rectangle_int_t& r);
 #endif
   explicit Rect(const gfx::Size& size);
   Rect(const gfx::Point& origin, const gfx::Size& size);
 
   ~Rect() {}
 
 #if defined(OS_WIN)
   Rect& operator=(const RECT& r);
 #elif defined(OS_MACOSX)
   Rect& operator=(const CGRect& r);
-#elif defined(USE_X11)
+#elif defined(TOOLKIT_USES_GTK)
   Rect& operator=(const GdkRectangle& r);
 #endif
 #if defined(USE_WAYLAND)
   Rect& operator=(const cairo_rectangle_int_t& r);
 #endif
 
   int x() const { return origin_.x(); }
   void set_x(int x) { origin_.set_x(x); }
 
   int y() const { return origin_.y(); }
@@ skipping 46 matching lines @@
   // the other rect's origin. If the origins are equal, then the
   // shortest rect is less than the other. If the origin and the
   // height are equal, then the narrowest rect is less than.
   // This comparison is required to use Rects in sets, or sorted
   // vectors.
   bool operator<(const Rect& other) const;
 
 #if defined(OS_WIN)
   // Construct an equivalent Win32 RECT object.
   RECT ToRECT() const;
-#elif defined(USE_X11)
+#elif defined(TOOLKIT_USES_GTK)
   GdkRectangle ToGdkRectangle() const;
 #elif defined(OS_MACOSX)
   // Construct an equivalent CoreGraphics object.
   CGRect ToCGRect() const;
 #endif
 #if defined(USE_WAYLAND)
   cairo_rectangle_int_t ToCairoRectangle() const;
 #endif
 
   // Returns true if the point identified by point_x and point_y falls inside
@@ skipping 51 matching lines @@
  private:
   gfx::Point origin_;
   gfx::Size size_;
 };
 
 UI_EXPORT std::ostream& operator<<(std::ostream& out, const gfx::Rect& r);
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RECT_H_