chrome/browser/ui/views/global_error_bubble_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/global_error_bubble_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

Index: chrome/browser/ui/views/global_error_bubble_view.cc

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

index 4733035bdacc6fd056021d1c040bfbb4a12ce7fb..4d3044e7d0b6bb3977192adfffd8a29c9623d85e 100644

--- a/chrome/browser/ui/views/global_error_bubble_view.cc

+++ b/chrome/browser/ui/views/global_error_bubble_view.cc

@@ -69,7 +69,7 @@ GlobalErrorBubbleView::GlobalErrorBubbleView(

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

int resource_id = error_->GetBubbleViewIconResourceID();

scoped_ptr<views::ImageView> image_view(new views::ImageView());

- image_view->SetImage(rb.GetImageNamed(resource_id).ToSkBitmap());

+ image_view->SetImage(rb.GetImageNamed(resource_id).ToImageSkia());

string16 title_string(error_->GetBubbleViewTitle());

scoped_ptr<views::Label> title_label(new views::Label(title_string));

« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.cc ('k') | chrome/browser/ui/views/hung_renderer_view.cc » ('j') | no next file with comments »