Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: chrome/browser/gtk/reload_button_gtk.cc

Issue 3086021: GTK toolbar - (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/gtk/browser_toolbar_gtk.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/gtk/reload_button_gtk.h" 5 #include "chrome/browser/gtk/reload_button_gtk.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "chrome/app/chrome_dll_resource.h" 9 #include "chrome/app/chrome_dll_resource.h"
10 #include "chrome/browser/browser.h" 10 #include "chrome/browser/browser.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 gtk_widget_set_size_request(widget_.get(), -1, -1); 196 gtk_widget_set_size_request(widget_.get(), -1, -1);
197 GtkRequisition req; 197 GtkRequisition req;
198 gtk_widget_size_request(widget(), &req); 198 gtk_widget_size_request(widget(), &req);
199 GtkButtonWidth = std::max(GtkButtonWidth, req.width); 199 GtkButtonWidth = std::max(GtkButtonWidth, req.width);
200 gtk_widget_set_size_request(widget_.get(), GtkButtonWidth, -1); 200 gtk_widget_set_size_request(widget_.get(), GtkButtonWidth, -1);
201 201
202 gtk_widget_set_app_paintable(widget_.get(), FALSE); 202 gtk_widget_set_app_paintable(widget_.get(), FALSE);
203 gtk_widget_set_double_buffered(widget_.get(), TRUE); 203 gtk_widget_set_double_buffered(widget_.get(), TRUE);
204 } else { 204 } else {
205 gtk_button_set_image(GTK_BUTTON(widget()), NULL);
206
205 gtk_widget_set_size_request(widget_.get(), reload_.Width(), 207 gtk_widget_set_size_request(widget_.get(), reload_.Width(),
206 reload_.Height()); 208 reload_.Height());
207 209
208 gtk_widget_set_app_paintable(widget_.get(), TRUE); 210 gtk_widget_set_app_paintable(widget_.get(), TRUE);
209 // We effectively double-buffer by virtue of having only one image... 211 // We effectively double-buffer by virtue of having only one image...
210 gtk_widget_set_double_buffered(widget_.get(), FALSE); 212 gtk_widget_set_double_buffered(widget_.get(), FALSE);
211 } 213 }
212 214
213 gtk_chrome_button_set_use_gtk_rendering( 215 gtk_chrome_button_set_use_gtk_rendering(
214 GTK_CHROME_BUTTON(widget_.get()), use_gtk); 216 GTK_CHROME_BUTTON(widget_.get()), use_gtk);
215 } 217 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/browser_toolbar_gtk.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698