ui/gfx: Remove the deprecated "operator const GdkPixbuf*" from Image API.

chrome/browser/ui/gtk/gtk_util.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/gtk_util.h"
 
 #include <cairo/cairo.h>
 
 #include <algorithm>
 #include <cstdarg>
@@ skipping 115 matching lines @@
   gtk_label_set_width_chars(
       GTK_LABEL(label),
       GetCharacterWidthForPixels(label, GPOINTER_TO_INT(pixel_width)));
 }
 
 // Ownership of |icon_list| is passed to the caller.
 GList* GetIconList() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   GList* icon_list = NULL;
   icon_list = g_list_append(icon_list,
-                            rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_32));
+      rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_32).ToGdkPixbuf());
   icon_list = g_list_append(icon_list,
-                            rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16));
+      rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16).ToGdkPixbuf());
   return icon_list;
 }
 
 // Returns the avatar icon for |profile|.
 //
 // Returns NULL if there is only one profile; always returns an icon for
 // Incognito profiles.
 //
 // The returned pixbuf must not be unreferenced or freed because it's owned by
 // either the resource bundle or the profile info cache.
 GdkPixbuf* GetAvatarIcon(Profile* profile) {
   if (profile->IsOffTheRecord()) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    return rb.GetNativeImageNamed(IDR_OTR_ICON);
+    return rb.GetNativeImageNamed(IDR_OTR_ICON).ToGdkPixbuf();
   }
 
   const ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
 
   if (!ProfileManager::IsMultipleProfilesEnabled() ||
       cache.GetNumberOfProfiles() < 2)
     return NULL;
 
   const size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
 
   return (index != std::string::npos ?
-          cache.GetAvatarIconOfProfileAtIndex(index) :
+          cache.GetAvatarIconOfProfileAtIndex(index).ToGdkPixbuf() :
           static_cast<GdkPixbuf*>(NULL));
 }
 
 // Gets the Chrome product icon.
 //
 // If it doesn't find the icon in |theme|, it looks among the icons packaged
 // with Chrome.
 //
 // Supported values of |size| are 16, 32, and 64. If the Chrome icon is found
 // in |theme|, the returned icon may not be of the requested size if |size|
@@ skipping 19 matching lines @@
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   int id = 0;
 
   switch (size) {
     case 16: id = IDR_PRODUCT_LOGO_16; break;
     case 32: id = IDR_PRODUCT_LOGO_32; break;
     case 64: id = IDR_PRODUCT_LOGO_64; break;
     default: CHECK(false); break;
   }
 
-  return gdk_pixbuf_copy(rb.GetNativeImageNamed(id));
+  return gdk_pixbuf_copy(rb.GetNativeImageNamed(id).ToGdkPixbuf());
 }
 
 // Adds |emblem| to the bottom-right corner of |icon|.
 //
 // Taking the ceiling of the scaled destination rect's dimensions (|dest_w|
 // and |dest_h|) because, if the destination rect is larger than the scaled
 // emblem, gdk_pixbuf_composite() will replicate the edge pixels of the emblem
 // to fill the gap, which is better than a cropped emblem, I think.
 void AddEmblem(const GdkPixbuf* emblem, GdkPixbuf* icon) {
   const int iw = gdk_pixbuf_get_width(icon);
@@ skipping 945 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderWidgetHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderWidgetHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util