Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/location_bar/keyword_hint_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/keyword_hint_view.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/label.h"
 
 // Amount of space to offset the tab image from the top of the view by.
 static const int kTabImageYOffset = 4;
 
 // The tab key image.
-static const SkBitmap* kTabButtonBitmap = NULL;
+static const gfx::ImageSkia* kTabButtonImage = NULL;
 
 KeywordHintView::KeywordHintView(Profile* profile) : profile_(profile) {
   leading_label_ = CreateLabel();
   trailing_label_ = CreateLabel();
 
-  if (!kTabButtonBitmap) {
+  if (!kTabButtonImage) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    kTabButtonBitmap = rb.GetBitmapNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB);
+    kTabButtonImage = rb.GetImageSkiaNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB);
   }
 }
 
 KeywordHintView::~KeywordHintView() {
 }
 
 void KeywordHintView::SetFont(const gfx::Font& font) {
   leading_label_->SetFont(font);
   trailing_label_->SetFont(font);
 }
@@ skipping 31 matching lines @@
 }
 
 void KeywordHintView::OnPaint(gfx::Canvas* canvas) {
   int image_x = leading_label_->visible() ? leading_label_->width() : 0;
 
   // Since we paint the button image directly on the canvas (instead of using a
   // child view), we must mirror the button's position manually if the locale
   // is right-to-left.
   gfx::Rect tab_button_bounds(image_x,
                               kTabImageYOffset,
-                              kTabButtonBitmap->width(),
-                              kTabButtonBitmap->height());
+                              kTabButtonImage->width(),
+                              kTabButtonImage->height());
   tab_button_bounds.set_x(GetMirroredXForRect(tab_button_bounds));
-  canvas->DrawBitmapInt(*kTabButtonBitmap,
+  canvas->DrawBitmapInt(*kTabButtonImage,
                         tab_button_bounds.x(),
                         tab_button_bounds.y());
 }
 
 gfx::Size KeywordHintView::GetPreferredSize() {
   // TODO(sky): currently height doesn't matter, once baseline support is
   // added this should check baselines.
   gfx::Size prefsize = leading_label_->GetPreferredSize();
   int width = prefsize.width();
-  width += kTabButtonBitmap->width();
+  width += kTabButtonImage->width();
   prefsize = trailing_label_->GetPreferredSize();
   width += prefsize.width();
   return gfx::Size(width, prefsize.height());
 }
 
 gfx::Size KeywordHintView::GetMinimumSize() {
   // TODO(sky): currently height doesn't matter, once baseline support is
   // added this should check baselines.
-  return gfx::Size(kTabButtonBitmap->width(), 0);
+  return gfx::Size(kTabButtonImage->width(), 0);
 }
 
 void KeywordHintView::Layout() {
   // TODO(sky): baseline layout.
-  bool show_labels = (width() != kTabButtonBitmap->width());
+  bool show_labels = (width() != kTabButtonImage->width());
 
   leading_label_->SetVisible(show_labels);
   trailing_label_->SetVisible(show_labels);
   int x = 0;
   gfx::Size pref;
 
   if (show_labels) {
     pref = leading_label_->GetPreferredSize();
     leading_label_->SetBounds(x, 0, pref.width(), height());
 
-    x += pref.width() + kTabButtonBitmap->width();
+    x += pref.width() + kTabButtonImage->width();
     pref = trailing_label_->GetPreferredSize();
     trailing_label_->SetBounds(x, 0, pref.width(), height());
   }
 }
 
 views::Label* KeywordHintView::CreateLabel() {
   views::Label* label = new views::Label();
   label->SetBackgroundColor(LocationBarView::GetColor(ToolbarModel::NONE,
       LocationBarView::BACKGROUND));
   label->SetEnabledColor(LocationBarView::GetColor(ToolbarModel::NONE,
       LocationBarView::DEEMPHASIZED_TEXT));
   AddChildView(label);
   return label;
 }