Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/ui/views/browser_actions_container.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/browser_actions_container.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 363 matching lines @@
 
 void BrowserActionsContainer::WriteDragDataForView(View* sender,
                                                    const gfx::Point& press_pt,
                                                    OSExchangeData* data) {
   DCHECK(data);
 
   for (size_t i = 0; i < browser_action_views_.size(); ++i) {
     BrowserActionButton* button = browser_action_views_[i]->button();
     if (button == sender) {
       // Set the dragging image for the icon.
-      scoped_ptr<gfx::Canvas> canvas(
-          browser_action_views_[i]->GetIconWithBadge());
-      drag_utils::SetDragImageOnDataObject(*canvas, button->size(), press_pt,
+      gfx::ImageSkia badge(browser_action_views_[i]->GetIconWithBadge());
+      drag_utils::SetDragImageOnDataObject(badge, button->size(), press_pt,
                                            data);
 
       // Fill in the remaining info.
       BrowserActionDragData drag_data(
           browser_action_views_[i]->button()->extension()->id(), i);
       drag_data.Write(profile_, data);
       break;
     }
   }
 }
@@ skipping 413 matching lines @@
   views::BubbleBorder::ArrowLocation arrow_location = base::i18n::IsRTL() ?
       views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;
   popup_ = ExtensionPopup::ShowPopup(popup_url,
                                      browser_,
                                      reference_view,
                                      arrow_location);
   popup_->GetWidget()->AddObserver(this);
   popup_button_ = button;
   popup_button_->SetButtonPushed();
 }