Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/detachable_toolbar_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/detachable_toolbar_view.h"
 
 #include "chrome/browser/themes/theme_service.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/window/non_client_view.h"
 
 // How round the 'new tab' style bookmarks bar is.
 static const int kNewtabBarRoundness = 5;
 
 const SkColor DetachableToolbarView::kEdgeDividerColor =
     SkColorSetRGB(222, 234, 248);
 const SkColor DetachableToolbarView::kMiddleDividerColor =
     SkColorSetRGB(194, 205, 212);
 
 // static
 void DetachableToolbarView::PaintBackgroundAttachedMode(
     gfx::Canvas* canvas,
     views::View* view,
     const gfx::Point& background_origin) {
   ui::ThemeProvider* tp = view->GetThemeProvider();
   canvas->FillRect(view->GetLocalBounds(),
                    tp->GetColor(ThemeService::COLOR_TOOLBAR));
-  canvas->TileImageInt(*tp->GetBitmapNamed(IDR_THEME_TOOLBAR),
+  canvas->TileImageInt(*tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR),
                        background_origin.x(), background_origin.y(), 0, 0,
                        view->width(), view->height());
 #if defined(USE_ASH)
   // Ash provides additional lightening at the edges of the toolbar.
-  SkBitmap* toolbar_left = tp->GetBitmapNamed(IDR_TOOLBAR_SHADE_LEFT);
+  gfx::ImageSkia* toolbar_left = tp->GetImageSkiaNamed(IDR_TOOLBAR_SHADE_LEFT);
   canvas->TileImageInt(*toolbar_left,
                        0, 0,
                        0, 0,
                        toolbar_left->width(), view->height());
-  SkBitmap* toolbar_right = tp->GetBitmapNamed(IDR_TOOLBAR_SHADE_RIGHT);
+  gfx::ImageSkia* toolbar_right =
+      tp->GetImageSkiaNamed(IDR_TOOLBAR_SHADE_RIGHT);
   canvas->TileImageInt(*toolbar_right,
                        0, 0,
                        view->width() - toolbar_right->width(), 0,
                        toolbar_right->width(), view->height());
 #endif
 }
 
 // static
 void DetachableToolbarView::CalculateContentArea(
     double animation_state, double horizontal_padding,
@@ skipping 72 matching lines @@
   // Draw the lower half of the divider.
   SkPaint paint_down;
   SkSafeUnref(paint_down.setShader(gfx::CreateGradientShader(
           height / 2, height - vertical_padding, middle_color, bottom_color)));
   SkRect rc_down = { SkIntToScalar(x),
                      SkIntToScalar(height / 2),
                      SkIntToScalar(x + 1),
                      SkIntToScalar(height - vertical_padding) };
   canvas->sk_canvas()->drawRect(rc_down, paint_down);
 }