Convert most of the rest of chrome to ImageSkia

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 40 matching lines @@
 }
 
 void IconLabelBubbleView::SetFont(const gfx::Font& font) {
   label_->SetFont(font);
 }
 
 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) {
   background_painter_.Paint(canvas, size());
 }
 
 gfx::Size IconLabelBubbleView::GetPreferredSize() {
   gfx::Size size(GetNonLabelSize());
   size.Enlarge(label_->GetPreferredSize().width(), 0);
   return size;
@@ skipping 12 matching lines @@
   label_->SetElideInMiddle(elide_in_middle);
 }
 
 gfx::Size IconLabelBubbleView::GetNonLabelSize() const {
   return gfx::Size(GetNonLabelWidth(), background_painter_.height());
 }
 
 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();
 }
 
 int IconLabelBubbleView::GetNonLabelWidth() const {
   return GetPreLabelWidth() + GetBubbleOuterPadding();
 }