GTK Themes: Theme the popup notification.

chrome/browser/gtk/blocked_popup_container_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/blocked_popup_container_view_gtk.h"
 
 #include "app/l10n_util.h"
 #include "base/gfx/gtk_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
+#include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
 #include "chrome/common/gtk_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 namespace {
 // The minimal border around the edge of the notification.
 const int kSmallPadding = 2;
@@ skipping 31 matching lines @@
 void BlockedPopupContainerViewGtk::GetURLAndTitleForPopup(
     size_t index, string16* url, string16* title) const {
   DCHECK(url);
   DCHECK(title);
   TabContents* tab_contents = model_->GetTabContentsAt(index);
   const GURL& tab_contents_url = tab_contents->GetURL().GetOrigin();
   *url = UTF8ToUTF16(tab_contents_url.possibly_invalid_spec());
   *title = tab_contents->GetTitle();
 }
 
+void BlockedPopupContainerViewGtk::UserChangedTheme(
+    GtkThemeProperties* properties) {
+  use_gtk_rendering_ = properties->use_gtk_rendering;
+
+  gtk_chrome_button_set_use_gtk_rendering(
+      GTK_CHROME_BUTTON(menu_button_), use_gtk_rendering_);
+}
+
 // Overridden from BlockedPopupContainerView:
 void BlockedPopupContainerViewGtk::SetPosition() {
   // No-op. Not required with the GTK version.
 }
 
 void BlockedPopupContainerViewGtk::ShowView() {
   // TODO(erg): Animate in.
   gtk_widget_show_all(container_.get());
 }
 
@@ skipping 42 matching lines @@
     model_->ToggleWhitelistingForHost(
         id_size_t - BlockedPopupContainer::kImpossibleNumberOfPopups - 1);
   } else {
     model_->LaunchPopupAtIndex(id_size_t - 1);
   }
 }
 
 BlockedPopupContainerViewGtk::BlockedPopupContainerViewGtk(
     BlockedPopupContainer* container)
     : model_(container),
+      use_gtk_rendering_(false),
       close_button_(CustomDrawButton::CloseButton()) {
   Init();
+
+  GtkThemeProperties properties(container->profile());
+  UserChangedTheme(&properties);
 }
 
 void BlockedPopupContainerViewGtk::Init() {
   menu_button_ = gtk_chrome_button_new();
   UpdateLabel();
   g_signal_connect(menu_button_, "clicked",
                    G_CALLBACK(OnMenuButtonClicked), this);
 
   GtkWidget* hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(hbox), menu_button_, FALSE, FALSE, kSmallPadding);
@@ skipping 41 matching lines @@
   container->launch_menu_->PopupAsContext(gtk_get_current_event_time());
 }
 
 void BlockedPopupContainerViewGtk::OnCloseButtonClicked(
     GtkButton *button, BlockedPopupContainerViewGtk* container) {
   container->model_->set_dismissed();
   container->model_->CloseAll();
 }
 
 gboolean BlockedPopupContainerViewGtk::OnContainerExpose(
-    GtkWidget* widget, GdkEventExpose* event) {
-  // TODO(erg): When evanm comes through the code, adding gtk theme support,
-  // what's here needs to go in a if block and the else should just paint the
-  // normal theme background with a border around the outsides.
+    GtkWidget* widget, GdkEventExpose* event,
+    BlockedPopupContainerViewGtk* container) {
   int width = widget->allocation.width;
   int height = widget->allocation.height;
-  int half_width = width / 2;
 
   // Clip to our damage rect
   cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
   cairo_rectangle(cr, event->area.x, event->area.y,
                   event->area.width, event->area.height);
   cairo_clip(cr);
 
-  // Draws our background gradient.
-  cairo_pattern_t* pattern = cairo_pattern_create_linear(
-      half_width, 0,  half_width, height);
-  cairo_pattern_add_color_stop_rgb(
-      pattern, 0.0,
-      kBackgroundColorTop[0], kBackgroundColorTop[1], kBackgroundColorTop[2]);
-  cairo_pattern_add_color_stop_rgb(
-      pattern, 1.0,
-      kBackgroundColorBottom[0], kBackgroundColorBottom[1],
-      kBackgroundColorBottom[2]);
-  cairo_set_source(cr, pattern);
-  cairo_paint(cr);
-  cairo_pattern_destroy(pattern);
+  if (!container->use_gtk_rendering_) {
+    // TODO(erg): We draw the gradient background only when GTK themes are

[tony, 2009/07/07 20:46:29]

I see, so we still draw the background, it's just not a gradient.  That sounds
fine to me.

+    // off. This isn't a perfect solution as this isn't themed! The views
+    // version doesn't appear to be themed either, so at least for now,
+    // constants are OK.
+    int half_width = width / 2;
+    cairo_pattern_t* pattern = cairo_pattern_create_linear(
+        half_width, 0,  half_width, height);
+    cairo_pattern_add_color_stop_rgb(
+        pattern, 0.0,
+        kBackgroundColorTop[0], kBackgroundColorTop[1], kBackgroundColorTop[2]);
+    cairo_pattern_add_color_stop_rgb(
+        pattern, 1.0,
+        kBackgroundColorBottom[0], kBackgroundColorBottom[1],
+        kBackgroundColorBottom[2]);
+    cairo_set_source(cr, pattern);
+    cairo_paint(cr);
+    cairo_pattern_destroy(pattern);
+  }
+
+  // TODO(erg): We need to figure out the border situation, too. We aren't
+  // provided a color from the theme system and the Windows implementation
+  // still uses constants for color. See the status bubble, too.
 
   // Sets up our stroke pen.
   cairo_set_source_rgb(cr, kBorderColor[0], kBorderColor[1], kBorderColor[2]);
   cairo_set_line_width(cr, 1.5);
 
   // Draws rounded corners around the edge of the notification, clockwise
   // starting from the bottom left. (A bezier curve with control points at 90
   // degree angles forms a circular arc.)
   cairo_move_to(cr, 0, height);
   cairo_line_to(cr, 0, kBackgroundCornerRadius);
   cairo_curve_to(cr, 0, kBackgroundCornerRadius,
                  0, 0, kBackgroundCornerRadius, 0);
   cairo_line_to(cr, width - kBackgroundCornerRadius, 0);
   cairo_curve_to(cr, width - kBackgroundCornerRadius, 0,
                  width, 0, width, kBackgroundCornerRadius);
   cairo_line_to(cr, width, height);
   cairo_stroke(cr);
 
   cairo_destroy(cr);
 
   return FALSE;  // Allow subwidgets to paint.
 }