Merge 55253 - GTK toolbar -...

chrome/browser/gtk/reload_button_gtk.cc

 // Copyright (c) 2010 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/reload_button_gtk.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
@@ skipping 185 matching lines @@
 
     gtk_widget_set_size_request(widget_.get(), -1, -1);
     GtkRequisition req;
     gtk_widget_size_request(widget(), &req);
     GtkButtonWidth = std::max(GtkButtonWidth, req.width);
     gtk_widget_set_size_request(widget_.get(), GtkButtonWidth, -1);
 
     gtk_widget_set_app_paintable(widget_.get(), FALSE);
     gtk_widget_set_double_buffered(widget_.get(), TRUE);
   } else {
+    gtk_button_set_image(GTK_BUTTON(widget()), NULL);
+
     gtk_widget_set_size_request(widget_.get(), reload_.Width(),
                                 reload_.Height());
 
     gtk_widget_set_app_paintable(widget_.get(), TRUE);
     // We effectively double-buffer by virtue of having only one image...
     gtk_widget_set_double_buffered(widget_.get(), FALSE);
   }
 
   gtk_chrome_button_set_use_gtk_rendering(
       GTK_CHROME_BUTTON(widget_.get()), use_gtk);
 }