Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/dropdown_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/dropdown_bar_view.h"
 
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/generated_resources.h"
@@ skipping 45 matching lines @@
 void DropdownBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
   // Find the offset from which to tile the toolbar background image.
   // First, get the origin with respect to the screen.
   gfx::Point origin = view->GetWidget()->GetWindowScreenBounds().origin();
   // Now convert from screen to parent coordinates.
   view->ConvertPointToView(NULL, browser_view_, &origin);
   // Finally, calculate the background image tiling offset.
   origin = browser_view_->OffsetPointForToolbarBackgroundImage(origin);
 
   ui::ThemeProvider* tp = view->GetThemeProvider();
-  SkBitmap background = *tp->GetBitmapNamed(IDR_THEME_TOOLBAR);
+  gfx::ImageSkia background = *tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR);
 
   int left_edge_width = left_alpha_mask_->width();
   int right_edge_width = right_alpha_mask_->width();
   int mask_height = left_alpha_mask_->height();
   int height = view->bounds().height();
 
   // Stretch the middle background to cover the entire area.
   canvas->TileImageInt(background, origin.x(), origin.y(),
       0, 0, view->bounds().width(), height);
 
@@ skipping 45 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // DropDownBarView, protected:
 
 void DropdownBarView::SetBackground(const gfx::ImageSkia* left_alpha_mask,
                                     const gfx::ImageSkia* right_alpha_mask) {
   set_background(new DropdownBackground(host()->browser_view(), left_alpha_mask,
       right_alpha_mask));
 }
 
-void DropdownBarView::SetBorder(int left_border_bitmap_id,
-                                int middle_border_bitmap_id,
-                                int right_border_bitmap_id) {
-  int border_bitmap_ids[3] = {left_border_bitmap_id, middle_border_bitmap_id,
-      right_border_bitmap_id};
+void DropdownBarView::SetBorder(int left_border_image_id,
+                                int middle_border_image_id,
+                                int right_border_image_id) {
+  int border_image_ids[3] = {left_border_image_id, middle_border_image_id,
+      right_border_image_id};
   set_border(views::Border::CreateBorderPainter(
-      new views::HorizontalPainter(border_bitmap_ids)));
+      new views::HorizontalPainter(border_image_ids)));
 }