GTK Themes: Make the omnibox area look more native.

chrome/browser/gtk/location_bar_view_gtk.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 "chrome/browser/gtk/location_bar_view_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 371 matching lines @@
   GdkRectangle inner_rect = {
       alloc_rect->x,
       alloc_rect->y + kTopMargin,
       alloc_rect->width,
       alloc_rect->height - kTopMargin - kBottomMargin};
 
   // Some of our calculations are a bit sloppy.  Since we draw on our parent
   // window, set a clip to make sure that we don't draw outside.
   gdk_gc_set_clip_rectangle(gc, &inner_rect);
 
-  // Draw our 1px border.  TODO(deanm): Maybe this would be cleaner as an
-  // overdrawn stroked rect with a clip to the allocation?
-  gdk_gc_set_rgb_fg_color(gc, &kBorderColor);
-  gdk_draw_rectangle(drawable, gc, TRUE,
-                     inner_rect.x,
-                     inner_rect.y,
-                     inner_rect.width,
-                     kBorderThickness);
-  gdk_draw_rectangle(drawable, gc, TRUE,
-                     inner_rect.x,
-                     inner_rect.y + inner_rect.height - kBorderThickness,
-                     inner_rect.width,
-                     kBorderThickness);
+  // If we're not using GTK theming, draw our own border.
+  if (!profile_ ||
+      !GtkThemeProvider::GetFrom(profile_)->UseGtkTheme()) {
+    // Draw our 1px border.  TODO(deanm): Maybe this would be cleaner as an
+    // overdrawn stroked rect with a clip to the allocation?
+    gdk_gc_set_rgb_fg_color(gc, &kBorderColor);
+    gdk_draw_rectangle(drawable, gc, TRUE,
+                       inner_rect.x,
+                       inner_rect.y,
+                       inner_rect.width,
+                       kBorderThickness);
+    gdk_draw_rectangle(drawable, gc, TRUE,
+                       inner_rect.x,
+                       inner_rect.y + inner_rect.height - kBorderThickness,
+                       inner_rect.width,
+                       kBorderThickness);
+  }
 
   // Draw the background within the border.
   gdk_gc_set_rgb_fg_color(gc,
       &kBackgroundColorByLevel[toolbar_model_->GetSchemeSecurityLevel()]);
   gdk_draw_rectangle(drawable, gc, TRUE,
                      inner_rect.x,
                      inner_rect.y + kBorderThickness,
                      inner_rect.width,
                      inner_rect.height - (kBorderThickness * 2));
 
@@ skipping 98 matching lines @@
   // The bubble needs to be just below the Omnibox and slightly to the right
   // of star button, so shift x and y co-ordinates.
   x += widget()->allocation.x + kFirstRunBubbleLeftMargin;
   y += widget()->allocation.y + widget()->allocation.height +
        kFirstRunBubbleTopMargin;
 
   FirstRunBubble::Show(profile_,
       GTK_WINDOW(gtk_widget_get_toplevel(widget())),
       gfx::Rect(x, y, 0, 0), use_OEM_bubble);
 }