chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc - Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

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/views/frame/app_panel_browser_frame_view.cc

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 8 years, 7 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/views/frame/app_non_client_frame_view_aura.cc ('k') | chrome/browser/ui/views/frame/browser_frame_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc

diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc

index 75c42c1b3c9e822b49389d2f573c418f24ebc92f..e117d1b6a22ac9354f90dc01b00d2ce271631fd0 100644

--- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc

+++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc

@@ -73,11 +73,11 @@ AppPanelBrowserFrameView::AppPanelBrowserFrameView(BrowserFrame* frame,

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

close_button_->SetImage(views::CustomButton::BS_NORMAL,

- rb.GetBitmapNamed(IDR_CLOSE_BAR));

+ rb.GetImageSkiaNamed(IDR_CLOSE_BAR));

close_button_->SetImage(views::CustomButton::BS_HOT,

- rb.GetBitmapNamed(IDR_CLOSE_BAR_H));

+ rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));

close_button_->SetImage(views::CustomButton::BS_PUSHED,

- rb.GetBitmapNamed(IDR_CLOSE_BAR_P));

+ rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));

close_button_->SetAccessibleName(

l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));

AddChildView(close_button_);