Adds some ifdefs so that test_shell can be compiled on linux...

base/gfx/rect.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 contain()) to complain in this case.
 
 #ifndef BASE_GFX_RECT_H__
 #define BASE_GFX_RECT_H__
 
 #include <iostream>
 
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 
 #if defined(OS_WIN)
 typedef struct tagRECT RECT;
-#elif defined(OS_LINUX)
-// It's wrong to hide GDK stuff behind OS_LINUX, but until we have a different
-// linux target, this is less complex.
+#elif defined(TOOLKIT_GTK)
 typedef struct _GdkRectangle GdkRectangle;
 #endif
 
 namespace gfx {
 
 class 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(OS_LINUX)
+#elif defined(TOOLKIT_GTK)
   explicit Rect(const GdkRectangle& r);
 #endif
   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(OS_LINUX)
+#elif defined(TOOLKIT_GTK)
   Rect& operator=(const GdkRectangle& r);
 #endif
 
   int x() const { return origin_.x(); }
   void set_x(int x) { origin_.set_x(x); }
 
   int y() const { return origin_.y(); }
   void set_y(int y) { origin_.set_y(y); }
 
   int width() const { return size_.width(); }
@@ skipping 31 matching lines @@
 
   bool operator==(const Rect& other) const;
 
   bool operator!=(const Rect& other) const {
     return !(*this == other);
   }
 
 #if defined(OS_WIN)
   // Construct an equivalent Win32 RECT object.
   RECT ToRECT() const;
-#elif defined(OS_LINUX)
+#elif defined(TOOLKIT_GTK)
   GdkRectangle ToGdkRectangle() const;
 #elif defined(OS_MACOSX)
   // Construct an equivalent CoreGraphics object.
   CGRect ToCGRect() const;
 #endif
 
   // Returns true if the point identified by point_x and point_y falls inside
   // this rectangle.  The point (x, y) is inside the rectangle, but the
   // point (x + width, y + height) is not.
   bool Contains(int point_x, int point_y) const;
@@ skipping 42 matching lines @@
   gfx::Size size_;
 };
 
 }  // namespace gfx
 
 inline std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) {
   return out << r.origin() << " " << r.size();
 }
 
 #endif  // BASE_GFX_RECT_H__