Move the titlebar background drawing from the titlebar to the

chrome/browser/gtk/browser_titlebar.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_titlebar.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 26 matching lines @@
 
 }  // namespace
 
 BrowserTitlebar::BrowserTitlebar(BrowserWindowGtk* browser_window,
                                  GtkWindow* window)
     : browser_window_(browser_window), window_(window) {
   Init();
 }
 
 void BrowserTitlebar::Init() {
-  titlebar_background_.reset(new NineBox(
-      browser_window_->browser()->profile()->GetThemeProvider(),
-      0, IDR_THEME_FRAME, 0, 0, 0, 0, 0, 0, 0));
-  titlebar_background_otr_.reset(new NineBox(
-      browser_window_->browser()->profile()->GetThemeProvider(),
-      0, IDR_THEME_FRAME_INCOGNITO, 0, 0, 0, 0, 0, 0, 0));
-
   // The widget hierarchy is shown below.
   //
   // +- HBox (container_) --------------------------------------------------+
   // |+- Alignment (titlebar_alignment_)-++- VBox (titlebar_buttons_box_) -+|
   // ||                                  ||+- HBox -----------------------+||
   // ||                                  |||+- button -++- button -+      |||
   // ||+- TabStripGtk ------------------+|||| minimize || restore  | ...  |||
   // ||| tab   tab   tab    tabclose    +|||+----------++----------+      |||
   // ||+--------------------------------+||+------------------------------+||
   // |+----------------------------------++--------------------------------+|
   // +----------------------------------------------------------------------+
   container_ = gtk_hbox_new(FALSE, 0);
 
-  g_signal_connect(G_OBJECT(container_), "expose-event",
-                   G_CALLBACK(OnExpose), this);
   g_signal_connect(window_, "window-state-event",
                    G_CALLBACK(OnWindowStateChanged), this);
 
   // We use an alignment to control the titlebar height.
   titlebar_alignment_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   gtk_box_pack_start(GTK_BOX(container_), titlebar_alignment_, TRUE,
                      TRUE, 0);
 
   // Put the tab strip in the titlebar.
   gtk_container_add(GTK_CONTAINER(titlebar_alignment_),
@@ skipping 44 matching lines @@
   if (use_custom_frame) {
     gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_),
         kTitlebarHeight, 0, 0, 0);
     gtk_widget_show(titlebar_buttons_box_);
   } else {
     gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_), 0, 0, 0, 0);
     gtk_widget_hide(titlebar_buttons_box_);
   }
 }
 
-gboolean BrowserTitlebar::OnExpose(GtkWidget* widget, GdkEventExpose* e,
-                                   BrowserTitlebar* titlebar) {
-  cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
-  cairo_rectangle(cr, e->area.x, e->area.y, e->area.width, e->area.height);
-  cairo_clip(cr);
-  Profile* profile = titlebar->browser_window_->browser()->profile();
-  NineBox* image = profile->IsOffTheRecord()
-      ? titlebar->titlebar_background_otr_.get()
-      : titlebar->titlebar_background_.get();
-  image->RenderTopCenterStrip(cr, e->area.x, 0, e->area.width);
-  cairo_destroy(cr);
-
-  return FALSE;  // Allow subwidgets to paint.
-}
-
 gboolean BrowserTitlebar::OnWindowStateChanged(GtkWindow* window,
     GdkEventWindowState* event, BrowserTitlebar* titlebar) {
   // Update the maximize/restore button.
   if (titlebar->browser_window_->IsMaximized()) {
     gtk_widget_hide(titlebar->maximize_button_->widget());
     gtk_widget_show(titlebar->restore_button_->widget());
   } else {
     gtk_widget_hide(titlebar->restore_button_->widget());
     gtk_widget_show(titlebar->maximize_button_->widget());
   }
@@ skipping 77 matching lines @@
       PrefService* prefs = browser_window_->browser()->profile()->GetPrefs();
       prefs->SetBoolean(prefs::kUseCustomChromeFrame,
                         !prefs->GetBoolean(prefs::kUseCustomChromeFrame));
       break;
     }
 
     default:
       NOTREACHED();
   }
 }