GTK: add back toolbar border....

chrome/browser/gtk/browser_window_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/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include <string>
@@ skipping 1467 matching lines @@
 }
 
 bool BrowserWindowGtk::ShouldShowWindowIcon() const {
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
 void BrowserWindowGtk::AddFindBar(FindBarGtk* findbar) {
   gtk_box_pack_start(GTK_BOX(render_area_vbox_), findbar->widget(),
                      FALSE, FALSE, 0);
   gtk_box_reorder_child(GTK_BOX(render_area_vbox_), findbar->widget(), 0);
+
+  gtk_widget_hide(toolbar_border_);
 }
 
 void BrowserWindowGtk::ResetCustomFrameCursor() {
   if (!frame_cursor_)
     return;
 
   gdk_cursor_unref(frame_cursor_);
   frame_cursor_ = NULL;
   gdk_window_set_cursor(GTK_WIDGET(window_)->window, NULL);
 }
@@ skipping 189 matching lines @@
   }
 #endif
 
   // This vbox surrounds the render area: find bar, info bars and render view.
   // The reason is that this area as a whole needs to be grouped in its own
   // GdkWindow hierarchy so that animations originating inside it (infobar,
   // download shelf, find bar) are all clipped to that area. This is why
   // |render_area_vbox_| is packed in |render_area_event_box_|.
   render_area_vbox_ = gtk_vbox_new(FALSE, 0);
   gtk_widget_set_name(render_area_vbox_, "chrome-render-area-vbox");
+
+  toolbar_border_ = gtk_event_box_new();
+  gtk_box_pack_start(GTK_BOX(render_area_vbox_),
+                     toolbar_border_, FALSE, FALSE, 0);
+  gtk_widget_set_size_request(toolbar_border_, -1, 1);
+  gtk_widget_show(toolbar_border_);
+
   infobar_container_.reset(new InfoBarContainerGtk(browser_->profile()));
   gtk_box_pack_start(GTK_BOX(render_area_vbox_),
                      infobar_container_->widget(),
                      FALSE, FALSE, 0);
 
   status_bubble_.reset(new StatusBubbleGtk(browser_->profile()));
 
   contents_container_.reset(new TabContentsContainerGtk(status_bubble_.get()));
   devtools_container_.reset(new TabContentsContainerGtk(NULL));
   ViewIDUtil::SetID(devtools_container_->widget(), VIEW_ID_DEV_TOOLS_DOCKED);
@@ skipping 98 matching lines @@
     gtk_widget_set_size_request(status_widget->GetNativeView(),
                                 status_area_size.width(),
                                 status_area_size.height());
     status_widget->Show();
   }
 #endif  // OS_CHROMEOS
 }
 
 void BrowserWindowGtk::SetBackgroundColor() {
   Profile* profile = browser()->profile();
-  ThemeProvider* theme_provider = profile->GetThemeProvider();
+  GtkThemeProvider* theme_provider = GtkThemeProvider::GetFrom(profile);
   int frame_color_id;
   if (IsActive()) {
     frame_color_id = browser()->profile()->IsOffTheRecord()
         ? BrowserThemeProvider::COLOR_FRAME_INCOGNITO
         : BrowserThemeProvider::COLOR_FRAME;
   } else {
     frame_color_id = browser()->profile()->IsOffTheRecord()
         ? BrowserThemeProvider::COLOR_FRAME_INCOGNITO_INACTIVE
         : BrowserThemeProvider::COLOR_FRAME_INACTIVE;
   }
 
   SkColor frame_color = theme_provider->GetColor(frame_color_id);
 
   // Paint the frame color on the left, right and bottom.
   GdkColor frame_color_gdk = SkColorToGdkColor(frame_color);
   gtk_widget_modify_bg(GTK_WIDGET(window_), GTK_STATE_NORMAL,
                        &frame_color_gdk);
 
   // Set the color of the dev tools divider.
   gtk_widget_modify_bg(contents_split_, GTK_STATE_NORMAL, &frame_color_gdk);
 
   // When the cursor is over the divider, GTK+ normally lightens the background
   // color by 1.3 (see LIGHTNESS_MULT in gtkstyle.c).  Since we're setting the
   // color, override the prelight also.
   color_utils::HSL hsl = { -1, 0.5, 0.65 };
   SkColor frame_prelight_color = color_utils::HSLShift(frame_color, hsl);
   GdkColor frame_prelight_color_gdk = SkColorToGdkColor(frame_prelight_color);
   gtk_widget_modify_bg(contents_split_, GTK_STATE_PRELIGHT,
       &frame_prelight_color_gdk);
+
+  GdkColor border_color = theme_provider->GetBorderColor();
+  gtk_widget_modify_bg(toolbar_border_, GTK_STATE_NORMAL, &border_color);
 }
 
 void BrowserWindowGtk::OnSizeChanged(int width, int height) {
   UpdateWindowShape(width, height);
 }
 
 void BrowserWindowGtk::UpdateWindowShape(int width, int height) {
   if (UseCustomFrame() && !IsFullscreen() && !IsMaximized()) {
     // Make the top corners rounded.  We set a mask that includes most of the
     // window except for a few pixels in the top two corners.
@@ skipping 447 matching lines @@
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "KWin" ||
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }