Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/location_bar/location_bar_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/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 142 matching lines @@
       mode_(mode),
       show_focus_rect_(false),
       template_url_service_(NULL),
       animation_offset_(0) {
   set_id(VIEW_ID_LOCATION_BAR);
 
   if (mode_ == NORMAL) {
     painter_.reset(
         views::Painter::CreateImagePainter(
             *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-                IDR_LOCATION_BAR_BORDER).ToSkBitmap(),
+                IDR_LOCATION_BAR_BORDER).ToImageSkia(),
             gfx::Insets(kBorderRoundCornerHeight, kBorderRoundCornerWidth,
                 kBorderRoundCornerHeight, kBorderRoundCornerWidth),
             true));
   }
 
   edit_bookmarks_enabled_.Init(prefs::kEditBookmarksEnabled,
                                profile_->GetPrefs(), this);
 }
 
 LocationBarView::~LocationBarView() {
@@ skipping 337 matching lines @@
 
 bool LocationBarView::IsLocationEntryFocusableInRootView() const {
 #if defined(USE_AURA)
   return AsViews(location_entry_.get())->IsLocationEntryFocusableInRootView();
 #else
   return views::View::IsFocusable();
 #endif
 }
 
 gfx::Size LocationBarView::GetPreferredSize() {
-  return gfx::Size(0, GetThemeProvider()->GetBitmapNamed(mode_ == POPUP ?
+  return gfx::Size(0, GetThemeProvider()->GetImageSkiaNamed(mode_ == POPUP ?
       IDR_LOCATIONBG_POPUPMODE_CENTER : IDR_LOCATIONBG_C)->height());
 }
 
 void LocationBarView::Layout() {
   if (!location_entry_.get())
     return;
 
   // TODO(jhawkins): Remove once crbug.com/101994 is fixed.
   CHECK(location_icon_view_);
 
@@ skipping 242 matching lines @@
 
   location_entry_view_->SetBoundsRect(location_bounds);
 }
 
 void LocationBarView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 
   if (painter_.get()) {
     painter_->Paint(canvas, size());
   } else if (mode_ == POPUP) {
-    canvas->TileImageInt(*GetThemeProvider()->GetBitmapNamed(
+    canvas->TileImageInt(*GetThemeProvider()->GetImageSkiaNamed(
         IDR_LOCATIONBG_POPUPMODE_CENTER), 0, 0, 0, 0, width(), height());
   }
   // When used in the app launcher, don't draw a border, the LocationBarView has
   // its own views::Border.
 
   // Draw the background color so that the graphical elements at the edges
   // appear over the correct color.  (The edit draws its own background, so this
   // isn't important for that.)
   // TODO(pkasting): We need images that are transparent in the middle, so we
   // can draw the border images over the background color instead of the
@@ skipping 565 matching lines @@
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }
 
 #if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif