Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia

chrome/browser/ui/views/frame/browser_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/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 234 matching lines @@
  public:
   ResizeCorner() {
     EnableCanvasFlippingForRTLUI(true);
   }
 
   virtual void OnPaint(gfx::Canvas* canvas) {
     views::Widget* widget = GetWidget();
     if (!widget || (widget->IsMaximized() || widget->IsFullscreen()))
       return;
 
-    SkBitmap* bitmap = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
-        IDR_TEXTAREA_RESIZER);
-    bitmap->buildMipMap(false);
-    canvas->DrawBitmapInt(*bitmap, width() - bitmap->width(),
-                          height() - bitmap->height());
+    gfx::ImageSkia* image = ui::ResourceBundle::GetSharedInstance().
+        GetImageSkiaNamed(IDR_TEXTAREA_RESIZER);
+    canvas->DrawBitmapInt(*image, width() - image->width(),
+                          height() - image->height());
   }
 
   static gfx::Size GetSize() {
     // This is disabled until we find what makes us slower when we let
     // WebKit know that we have a resizer rect...
     // int scrollbar_thickness = gfx::scrollbar_size();
     // return gfx::Size(scrollbar_thickness, scrollbar_thickness);
     return gfx::Size();
   }
 
@@ skipping 236 matching lines @@
 }
 
 WebContents* BrowserView::GetSelectedWebContents() const {
   return browser_->GetSelectedWebContents();
 }
 
 TabContentsWrapper* BrowserView::GetSelectedTabContentsWrapper() const {
   return browser_->GetSelectedTabContentsWrapper();
 }
 
-SkBitmap BrowserView::GetOTRAvatarIcon() const {
+gfx::ImageSkia BrowserView::GetOTRAvatarIcon() const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  const SkBitmap* otr_avatar =
-      rb.GetNativeImageNamed(IDR_OTR_ICON).ToSkBitmap();
+  const gfx::ImageSkia* otr_avatar =
+      rb.GetNativeImageNamed(IDR_OTR_ICON).ToImageSkia();
   return *otr_avatar;
 }
 
 bool BrowserView::IsPositionInWindowCaption(const gfx::Point& point) {
   return GetBrowserViewLayout()->IsPositionInWindowCaption(point);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindow implementation:
 
@@ skipping 892 matching lines @@
 bool BrowserView::ShouldShowWindowTitle() const {
 #if defined(USE_ASH)
   // For Ash only, app host windows do not show an icon, crbug.com/119411.
   // Child windows (e.g. extension panels, popups) do show an icon.
   if (browser_->is_app() && browser_->app_type() == Browser::APP_TYPE_HOST)
     return false;
 #endif
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
-SkBitmap BrowserView::GetWindowAppIcon() {
+gfx::ImageSkia BrowserView::GetWindowAppIcon() {
   if (browser_->is_app()) {
     TabContentsWrapper* contents = browser_->GetSelectedTabContentsWrapper();
     if (contents && contents->extension_tab_helper()->GetExtensionAppIcon())
       return *contents->extension_tab_helper()->GetExtensionAppIcon();
   }
 
   return GetWindowIcon();
 }
 
-SkBitmap BrowserView::GetWindowIcon() {
+gfx::ImageSkia BrowserView::GetWindowIcon() {
   if (browser_->is_app())
     return browser_->GetCurrentPageIcon();
-  return SkBitmap();
+  return gfx::ImageSkia();
 }
 
 bool BrowserView::ShouldShowWindowIcon() const {
 #if defined(USE_ASH)
   // For Ash only, app host windows do not show an icon, crbug.com/119411.
   // Child windows (e.g. extension panels, popups) do show an icon.
   if (browser_->is_app() && browser_->app_type() == Browser::APP_TYPE_HOST)
     return false;
 #endif
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
@@ skipping 958 matching lines @@
 
   PasswordGenerationBubbleView* bubble =
       new PasswordGenerationBubbleView(bounds,
                                        this,
                                        web_contents->GetRenderViewHost(),
                                        browser_.get());
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   bubble->Show();
 }