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

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

Issue 155367: Revert "Add button tinting to the toolbar buttons." (Closed)
Patch Set: Created 11 years, 5 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/back_forward_button_gtk.cc ('k') | chrome/browser/gtk/custom_button.h » ('j') | 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/browser_toolbar_gtk.h" 5 #include "chrome/browser/gtk/browser_toolbar_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 #include <X11/XF86keysym.h> 8 #include <X11/XF86keysym.h>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 321
322 return gfx::Rect(star_x + kPopupLeftRightMargin, star_y + kPopupTopMargin, 322 return gfx::Rect(star_x + kPopupLeftRightMargin, star_y + kPopupTopMargin,
323 go_x - star_x - (2 * kPopupLeftRightMargin), 0); 323 go_x - star_x - (2 * kPopupLeftRightMargin), 0);
324 } 324 }
325 325
326 // BrowserToolbarGtk, private -------------------------------------------------- 326 // BrowserToolbarGtk, private --------------------------------------------------
327 327
328 CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton( 328 CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton(
329 int normal_id, int active_id, int highlight_id, int depressed_id, 329 int normal_id, int active_id, int highlight_id, int depressed_id,
330 const std::string& localized_tooltip, const char* stock_id) { 330 const std::string& localized_tooltip, const char* stock_id) {
331 CustomDrawButton* button = new CustomDrawButton(profile_->GetThemeProvider(), 331 CustomDrawButton* button = new CustomDrawButton(normal_id, active_id,
332 normal_id, active_id, highlight_id, depressed_id, stock_id); 332 highlight_id, depressed_id, stock_id);
333 333
334 gtk_widget_set_tooltip_text(button->widget(), 334 gtk_widget_set_tooltip_text(button->widget(),
335 localized_tooltip.c_str()); 335 localized_tooltip.c_str());
336 g_signal_connect(button->widget(), "clicked", 336 g_signal_connect(button->widget(), "clicked",
337 G_CALLBACK(OnButtonClick), this); 337 G_CALLBACK(OnButtonClick), this);
338 g_signal_connect(button->widget(), "button-release-event", 338 g_signal_connect(button->widget(), "button-release-event",
339 G_CALLBACK(OnButtonRelease), this); 339 G_CALLBACK(OnButtonRelease), this);
340 340
341 gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0); 341 gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
342 return button; 342 return button;
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 break; 526 break;
527 } 527 }
528 } 528 }
529 529
530 void BrowserToolbarGtk::InitNineBox() { 530 void BrowserToolbarGtk::InitNineBox() {
531 // TODO(estade): use |profile_|? 531 // TODO(estade): use |profile_|?
532 background_ninebox_.reset(new NineBox( 532 background_ninebox_.reset(new NineBox(
533 browser_->profile()->GetThemeProvider(), 533 browser_->profile()->GetThemeProvider(),
534 0, IDR_THEME_TOOLBAR, 0, 0, 0, 0, 0, 0, 0)); 534 0, IDR_THEME_TOOLBAR, 0, 0, 0, 0, 0, 0, 0));
535 } 535 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/back_forward_button_gtk.cc ('k') | chrome/browser/gtk/custom_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698