Make findbar paint themed image.

Also, fixed drawing of background images that are not 1 pixel wide. (The code for this is somewhat speculative as there is no way of testing it at the moment, but for now it should still at least look correct.)

If you open the findbar while the bookmark bar is opened and then close the bookmark bar, the findbar painting is a little messed up in that it still thinks it's farther away from the tabstrip than it really is. The solution (unfortunately) is to continuously repaint the findbar as it is closing. Since this is glitch is hardly noticeable, I'm putting off fixing it.

TEST=findbar should look more integrated with bookmark bar, toolbar.
BUG=none

Review URL: http://codereview.chromium.org/125084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18339 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 1 deletions

diff --git a/chrome/browser/gtk/find_bar_gtk.h b/chrome/browser/gtk/find_bar_gtk.h
index 8b31b61..57b445f 100644
--- a/chrome/browser/gtk/find_bar_gtk.h
+++ b/chrome/browser/gtk/find_bar_gtk.h
@@ -13,9 +13,11 @@
 #include "chrome/browser/gtk/focus_store_gtk.h"
 #include "chrome/common/owned_widget_gtk.h"
 
+class Browser;
 class BrowserWindowGtk;
 class CustomDrawButton;
 class FindBarController;
+class NineBox;
 class SlideAnimatorGtk;
 class TabContentsContainerGtk;
 
@@ -24,7 +26,7 @@ class TabContentsContainerGtk;
 class FindBarGtk : public FindBar,
                    public FindBarTesting {
  public:
-  explicit FindBarGtk(BrowserWindowGtk* browser);
+  explicit FindBarGtk(Browser* browser);
   virtual ~FindBarGtk();
 
   GtkWidget* widget() const { return fixed_.get(); }
@@ -100,12 +102,18 @@ class FindBarGtk : public FindBar,
                                       GtkAllocation* allocation,
                                       FindBarGtk* findbar);
 
+  static gboolean OnExpose(GtkWidget* widget, GdkEventExpose* event,
+                           FindBarGtk* bar);
+
   // These are both used for focus management.
   static gboolean OnFocus(GtkWidget* text_entry, GtkDirectionType focus,
                           FindBarGtk* find_bar);
   static gboolean OnButtonPress(GtkWidget* text_entry, GdkEventButton* e,
                                 FindBarGtk* find_bar);
 
+  Browser* browser_;
+  BrowserWindowGtk* window_;
+
   // GtkFixed containing the find bar widgets.
   OwnedWidgetGtk fixed_;
 
@@ -149,6 +157,8 @@ class FindBarGtk : public FindBar,
   // If true, the change signal for the text entry is ignored.
   bool ignore_changed_signal_;
 
+  scoped_ptr<NineBox> dialog_background_;
+
   DISALLOW_COPY_AND_ASSIGN(FindBarGtk);
 };