Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/tabs/tab_drag_controller.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/tabs/tab_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/ui/views/tabs/touch_tab_strip_layout.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/events.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/events/event.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ash/wm/property_util.h"
 #endif
 
@@ skipping 48 matching lines @@
     // Fill the background rect.
     SkPaint paint;
     paint.setColor(SkColorSetRGB(108, 108, 108));
     paint.setStyle(SkPaint::kFill_Style);
     canvas->sk_canvas()->drawRoundRect(
         outer_rect, SkIntToScalar(kRoundedRectRadius),
         SkIntToScalar(kRoundedRectRadius), paint);
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
-    SkBitmap* high_icon = rb.GetBitmapNamed(IDR_DOCK_HIGH);
-    SkBitmap* wide_icon = rb.GetBitmapNamed(IDR_DOCK_WIDE);
+    gfx::ImageSkia* high_icon = rb.GetImageSkiaNamed(IDR_DOCK_HIGH);
+    gfx::ImageSkia* wide_icon = rb.GetImageSkiaNamed(IDR_DOCK_WIDE);
 
     canvas->Save();
     bool rtl_ui = base::i18n::IsRTL();
     if (rtl_ui) {
       // Flip canvas to draw the mirrored tab images for RTL UI.
       canvas->Translate(gfx::Point(width(), 0));
       canvas->Scale(-1, 1);
     }
     int x_of_active_tab = width() / 2 + kTabSpacing / 2;
     int x_of_inactive_tab = width() / 2 - high_icon->width() - kTabSpacing / 2;
     switch (type_) {
       case DockInfo::LEFT_OF_WINDOW:
       case DockInfo::LEFT_HALF:
         if (!rtl_ui)
           std::swap(x_of_active_tab, x_of_inactive_tab);
         canvas->DrawBitmapInt(*high_icon, x_of_active_tab,
                               (height() - high_icon->height()) / 2);
         if (type_ == DockInfo::LEFT_OF_WINDOW) {
-          DrawBitmapWithAlpha(canvas, *high_icon, x_of_inactive_tab,
-                              (height() - high_icon->height()) / 2);
+          DrawImageWithAlpha(canvas, *high_icon, x_of_inactive_tab,
+                             (height() - high_icon->height()) / 2);
         }
         break;
 
 
       case DockInfo::RIGHT_OF_WINDOW:
       case DockInfo::RIGHT_HALF:
         if (rtl_ui)
           std::swap(x_of_active_tab, x_of_inactive_tab);
         canvas->DrawBitmapInt(*high_icon, x_of_active_tab,
                               (height() - high_icon->height()) / 2);
         if (type_ == DockInfo::RIGHT_OF_WINDOW) {
-         DrawBitmapWithAlpha(canvas, *high_icon, x_of_inactive_tab,
-                             (height() - high_icon->height()) / 2);
+         DrawImageWithAlpha(canvas, *high_icon, x_of_inactive_tab,
+                           (height() - high_icon->height()) / 2);
         }
         break;
 
       case DockInfo::TOP_OF_WINDOW:
         canvas->DrawBitmapInt(*wide_icon, (width() - wide_icon->width()) / 2,
                               height() / 2 - high_icon->height());
         break;
 
       case DockInfo::MAXIMIZE: {
-        SkBitmap* max_icon = rb.GetBitmapNamed(IDR_DOCK_MAX);
+        gfx::ImageSkia* max_icon = rb.GetImageSkiaNamed(IDR_DOCK_MAX);
         canvas->DrawBitmapInt(*max_icon, (width() - max_icon->width()) / 2,
                               (height() - max_icon->height()) / 2);
         break;
       }
 
       case DockInfo::BOTTOM_HALF:
       case DockInfo::BOTTOM_OF_WINDOW:
         canvas->DrawBitmapInt(*wide_icon, (width() - wide_icon->width()) / 2,
                               height() / 2 + kTabSpacing / 2);
         if (type_ == DockInfo::BOTTOM_OF_WINDOW) {
-          DrawBitmapWithAlpha(canvas, *wide_icon,
+          DrawImageWithAlpha(canvas, *wide_icon,
               (width() - wide_icon->width()) / 2,
               height() / 2 - kTabSpacing / 2 - wide_icon->height());
         }
         break;
 
       default:
         NOTREACHED();
         break;
     }
     canvas->Restore();
   }
 
  private:
-  void DrawBitmapWithAlpha(gfx::Canvas* canvas, const SkBitmap& image,
-                           int x, int y) {
+  void DrawImageWithAlpha(gfx::Canvas* canvas, const gfx::ImageSkia& image,
+                          int x, int y) {
     SkPaint paint;
     paint.setAlpha(128);
     canvas->DrawBitmapInt(image, x, y, paint);
   }
 
   DockInfo::Type type_;
 
   DISALLOW_COPY_AND_ASSIGN(DockView);
 };
 
@@ skipping 1687 matching lines @@
     }
 
     default:
       break; // Nothing to do for DETACH_ABOVE_OR_BELOW.
   }
 
   SetTrackedByWorkspace(browser->window()->GetNativeHandle(), false);
   browser->window()->SetBounds(new_bounds);
   return browser;
 }