Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/tabs/tab_strip.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_strip.h"
 
 #include <algorithm>
 #include <iterator>
 #include <vector>
 
@@ skipping 14 matching lines @@
 #include "chrome/browser/ui/views/tabs/touch_tab_strip_layout.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/animation_container.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
-#include "ui/base/layout.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/mouse_watcher_view_host.h"
 #include "ui/views/view_model_utils.h"
 #include "ui/views/widget/default_theme_provider.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
@@ skipping 265 matching lines @@
   // be able to click on complete bounds, and so don't return a custom hit
   // mask.
   return !tab_strip_->SizeTabButtonToTopOfTabStrip();
 }
 
 void NewTabButton::GetHitTestMask(gfx::Path* path) const {
   DCHECK(path);
 
   SkScalar w = SkIntToScalar(width());
 
-  // These values are defined by the shape of the new tab bitmap. Should that
-  // bitmap ever change, these values will need to be updated. They're so
+  // These values are defined by the shape of the new tab image. Should that
+  // image ever change, these values will need to be updated. They're so
   // custom it's not really worth defining constants for.
-  // These values are correct for regular and USE_ASH versions of the bitmap.
+  // These values are correct for regular and USE_ASH versions of the image.
   path->moveTo(0, 1);
   path->lineTo(w - 7, 1);
   path->lineTo(w - 4, 4);
   path->lineTo(w, 16);
   path->lineTo(w - 1, 17);
   path->lineTo(7, 17);
   path->lineTo(4, 13);
   path->lineTo(0, 1);
   path->close();
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 void NewTabButton::OnMouseReleased(const views::MouseEvent& event) {
   if (event.IsOnlyRightMouseButton()) {
     gfx::Point point(event.x(), event.y());
     views::View::ConvertPointToScreen(this, &point);
     ui::ShowSystemMenu(GetWidget()->GetNativeView(), point.x(), point.y());
     SetState(BS_NORMAL);
     return;
   }
   views::ImageButton::OnMouseReleased(event);
 }
 #endif
 
 void NewTabButton::OnPaint(gfx::Canvas* canvas) {
-  SkBitmap bitmap = GetBitmap();
-  canvas->DrawBitmapInt(bitmap, 0, height() - bitmap.height());
+  SkBitmap image = GetBitmap();
+  canvas->DrawBitmapInt(image, 0, height() - image.height());
 }
 
 bool NewTabButton::ShouldUseNativeFrame() const {
   return GetWidget() &&
     GetWidget()->GetTopLevelWidget()->ShouldUseNativeFrame();
 }
 
 SkBitmap NewTabButton::GetBackgroundBitmap(
     views::CustomButton::ButtonState state) const {
   int background_id = 0;
@@ skipping 11 matching lines @@
       alpha = ShouldUseNativeFrame() ? kNativeFrameInactiveTabAlpha : 255;
       break;
     case views::CustomButton::BS_PUSHED:
       alpha = 145;
       break;
     default:
       NOTREACHED();
       break;
   }
 
-  SkBitmap* mask = GetThemeProvider()->GetBitmapNamed(IDR_NEWTAB_BUTTON_MASK);
+  gfx::ImageSkia* mask =
+      GetThemeProvider()->GetImageSkiaNamed(IDR_NEWTAB_BUTTON_MASK);
   int height = mask->height();
   int width = mask->width();
   gfx::Canvas canvas(gfx::Size(width, height), false);
 
   // For custom images the background starts at the top of the tab strip.
   // Otherwise the background starts at the top of the frame.
-  SkBitmap* background = GetThemeProvider()->GetBitmapNamed(background_id);
+  gfx::ImageSkia* background =
+      GetThemeProvider()->GetImageSkiaNamed(background_id);
   int offset_y = GetThemeProvider()->HasCustomImage(background_id) ?
       0 : background_offset_.y();
   canvas.TileImageInt(*background, GetMirroredX() + background_offset_.x(),
                       newtab_button_v_offset() + offset_y, 0, 0, width, height);
 
   if (alpha != 255) {
     SkPaint paint;
     paint.setColor(SkColorSetARGB(alpha, 255, 255, 255));
     paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
     paint.setStyle(SkPaint::kFill_Style);
     canvas.DrawRect(gfx::Rect(0, 0, width, height), paint);
   }
 
   // White highlight on hover.
   if (state == views::CustomButton::BS_HOT)
     canvas.FillRect(gfx::Rect(size()), SkColorSetARGB(64, 255, 255, 255));
 
   return SkBitmapOperations::CreateMaskedBitmap(canvas.ExtractBitmap(), *mask);
 }
 
 SkBitmap NewTabButton::GetBitmapForState(
     views::CustomButton::ButtonState state) const {
   int overlay_id = state == views::CustomButton::BS_PUSHED ?
       IDR_NEWTAB_BUTTON_P : IDR_NEWTAB_BUTTON;
-  SkBitmap* overlay = GetThemeProvider()->GetBitmapNamed(overlay_id);
+  gfx::ImageSkia* overlay = GetThemeProvider()->GetImageSkiaNamed(overlay_id);
 
   gfx::Canvas canvas(gfx::Size(overlay->width(), overlay->height()), false);
   canvas.DrawBitmapInt(GetBackgroundBitmap(state), 0, 0);
 
   // Draw the button border with a slight alpha.
   const int kNativeFrameOverlayAlpha = 178;
   const int kOpaqueFrameOverlayAlpha = 230;
   canvas.SaveLayerAlpha(ShouldUseNativeFrame() ?
       kNativeFrameOverlayAlpha : kOpaqueFrameOverlayAlpha);
   canvas.DrawBitmapInt(*overlay, 0, 0);
@@ skipping 1826 matching lines @@
 
   int mini_tab_count = GetMiniTabCount();
   int normal_count = tab_count() - mini_tab_count;
   if (normal_count == 0 || normal_count == mini_tab_count)
     return false;
   int x = GetStartXForNormalTabs();
   int available_width = width() - x - new_tab_button_width();
   return (Tab::GetTouchWidth() * normal_count +
           tab_h_offset() * (normal_count - 1)) > available_width;
 }