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

« no previous file with comments | « chrome/browser/ui/views/location_bar/content_setting_image_view.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

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

index e8f58140ec17e2dff76ba8d224f4dc3b8f5946df..2df74e60abd39445cb3074ac72476c703c300fa2 100644

--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

@@ -37,7 +37,8 @@ IconLabelBubbleView::IconLabelBubbleView(const int background_images[],

is_extension_icon_(false) {

image_ = new views::ImageView();

image_->SetImage(

- ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(contained_image));

+ ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

+ contained_image));

AddChildView(image_);

label_ = new views::Label();