chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc - Issue 12703039: Inconsistent use of [x] close panel icon. Code changes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc

Issue 12703039: Inconsistent use of [x] close panel icon. Code changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added recently added local NTP file. Created 7 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/gtk/one_click_signin_bubble_gtk.cc ('k') | chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc

diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc

index 9a3a84499b46436c0e7b6c783400d3939930552c..54b984db2cee17cb67bef5aaea9b3e2e28efb984 100644

--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc

+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc

@@ -820,8 +820,8 @@ void TabRendererGtk::Layout() {

close_button_color_ = tab_text_color;

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

close_button_->SetBackground(close_button_color_,

- rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap(),

- rb.GetImageNamed(IDR_TAB_CLOSE_MASK).AsBitmap());

+ rb.GetImageNamed(IDR_CLOSE_1).AsBitmap(),

+ rb.GetImageNamed(IDR_CLOSE_1_MASK).AsBitmap());

}

} else {

@@ -1140,8 +1140,7 @@ bool TabRendererGtk::ShouldShowCloseBox() const {

}

CustomDrawButton* TabRendererGtk::MakeCloseButton() {

- CustomDrawButton* button = new CustomDrawButton(IDR_TAB_CLOSE,

- IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE);

+ CustomDrawButton* button = CustomDrawButton::CloseButtonBar(theme_service_);

button->ForceChromeTheme();

g_signal_connect(button->widget(), "clicked",

@@ -1246,7 +1245,7 @@ void TabRendererGtk::InitResources() {

IDR_TAB_INACTIVE_LEFT).ToGdkPixbuf();

tab_inactive_l_height_ = gdk_pixbuf_get_height(tab_inactive_l);

- GdkPixbuf* tab_close = rb.GetNativeImageNamed(IDR_TAB_CLOSE).ToGdkPixbuf();

+ GdkPixbuf* tab_close = rb.GetNativeImageNamed(IDR_CLOSE_1).ToGdkPixbuf();

close_button_width_ = gdk_pixbuf_get_width(tab_close);

close_button_height_ = gdk_pixbuf_get_height(tab_close);