Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 798 matching lines @@
       false);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED,
       content::Source<Profile>(profile),
       content::Details<AccessibilityTextBoxInfo>(&info));
 
   // Update the keyword and search hint states.
   OnChanged();
 }
 
-SkBitmap LocationBarViewGtk::GetFavicon() const {
-  return GetTabContents()->favicon_tab_helper()->GetFavicon().AsBitmap();
+gfx::Image LocationBarViewGtk::GetFavicon() const {
+  return GetTabContents()->favicon_tab_helper()->GetFavicon();
 }
 
 string16 LocationBarViewGtk::GetTitle() const {
   return GetWebContents()->GetTitle();
 }
 
 InstantController* LocationBarViewGtk::GetInstant() {
   return browser_->instant_controller()->instant();
 }
 
@@ skipping 511 matching lines @@
 
 void LocationBarViewGtk::OnIconDragData(GtkWidget* sender,
                                         GdkDragContext* context,
                                         GtkSelectionData* data,
                                         guint info, guint time) {
   ui::WriteURLWithName(data, drag_url_, drag_title_, info);
 }
 
 void LocationBarViewGtk::OnIconDragBegin(GtkWidget* sender,
                                          GdkDragContext* context) {
-  SkBitmap favicon = GetFavicon();
-  GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(favicon);
+  gfx::Image favicon = GetFavicon();
+  GdkPixbuf* pixbuf = favicon.ToGdkPixbuf();

[Nico, 2012/08/16 20:26:27]

This will fail if favicon.IsEmpty(). Move the if(!pixbuf) check above this line
(and change it to `if (favicon.IsEmpty())`, then it's safe.

   if (!pixbuf)
     return;
   drag_icon_ = bookmark_utils::GetDragRepresentation(pixbuf,
       GetTitle(), theme_service_);
   g_object_unref(pixbuf);

[Nico, 2012/08/16 20:26:27]

This is now wrong.

   gtk_drag_set_icon_widget(context, drag_icon_, 0, 0);
 
   WebContents* tab = GetWebContents();
   if (!tab)
     return;
   drag_url_ = tab->GetURL();
   drag_title_ = tab->GetTitle();
 }
 
 void LocationBarViewGtk::OnIconDragEnd(GtkWidget* sender,
@@ skipping 684 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }