More linux ifdef tweaks. This reverts my earlier change (13503)....

base/gfx/rect.cc

 // 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.
 
 #include "base/gfx/rect.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_MACOSX)
 #include <CoreGraphics/CGGeometry.h>
-#elif defined(TOOLKIT_GTK)
+#elif defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
 #include "base/logging.h"
 
 namespace {
 
 void AdjustAlongAxis(int dst_origin, int dst_size, int* origin, int* size) {
   if (*origin < dst_origin) {
     *origin = dst_origin;
@@ skipping 45 matching lines @@
   set_width(r.size.width);
   set_height(r.size.height);
 }
 
 Rect& Rect::operator=(const CGRect& r) {
   origin_.SetPoint(r.origin.x, r.origin.y);
   set_width(r.size.width);
   set_height(r.size.height);
   return *this;
 }
-#elif defined(TOOLKIT_GTK)
+#elif defined(OS_LINUX)
 Rect::Rect(const GdkRectangle& r)
     : origin_(r.x, r.y) {
   set_width(r.width);
   set_height(r.height);
 }
 
 Rect& Rect::operator=(const GdkRectangle& r) {
   origin_.SetPoint(r.x, r.y);
   set_width(r.width);
   set_height(r.height);
@@ skipping 31 matching lines @@
 
 #if defined(OS_WIN)
 RECT Rect::ToRECT() const {
   RECT r;
   r.left = x();
   r.right = right();
   r.top = y();
   r.bottom = bottom();
   return r;
 }
-#elif defined(TOOLKIT_GTK)
+#elif defined(OS_LINUX)
 GdkRectangle Rect::ToGdkRectangle() const {
   GdkRectangle r = {x(), y(), width(), height()};
   return r;
 }
 #elif defined(OS_MACOSX)
 CGRect Rect::ToCGRect() const {
   return CGRectMake(x(), y(), width(), height());
 }
 #endif
 
@@ skipping 77 matching lines @@
   AdjustAlongAxis(rect.x(), rect.width(), &new_x, &new_width);
   AdjustAlongAxis(rect.y(), rect.height(), &new_y, &new_height);
   return Rect(new_x, new_y, new_width, new_height);
 }
 
 Point Rect::CenterPoint() const {
   return Point(x() + (width() + 1) / 2, y() + (height() + 1) / 2);
 }
 
 }  // namespace gfx