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

Unified Diff: chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

Issue 10453101: Convert most of the rest of chrome to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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/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 2df74e60abd39445cb3074ac72476c703c300fa2..540180c938a61afc827186b1dfeaa1fddfd03a6d 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
@@ -58,8 +58,8 @@ void IconLabelBubbleView::SetLabel(const string16& label) {
label_->SetText(label);
}
-void IconLabelBubbleView::SetImage(const SkBitmap& bitmap) {
- image_->SetImage(bitmap);
+void IconLabelBubbleView::SetImage(const gfx::ImageSkia& image_skia) {
+ image_->SetImage(image_skia);
}
void IconLabelBubbleView::OnPaint(gfx::Canvas* canvas) {
@@ -92,7 +92,7 @@ gfx::Size IconLabelBubbleView::GetNonLabelSize() const {
int IconLabelBubbleView::GetPreLabelWidth() const {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
return GetBubbleOuterPadding() +
- rb.GetBitmapNamed(IDR_OMNIBOX_SEARCH)->width() +
+ rb.GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)->width() +
LocationBarView::GetItemPadding();
}

Powered by Google App Engine
This is Rietveld 408576698