Add support for multiple icon sizes for Mac platform apps

chrome/browser/ui/gtk/browser_actions_toolbar_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/browser_actions_toolbar_gtk.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 21 matching lines @@
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/gtk_util.h"
+#include "ui/gfx/image/image.h"
 
 namespace {
 
 // The width of the browser action buttons.
 const int kButtonWidth = 27;
 
 // The padding between browser action buttons.
 const int kButtonPadding = 4;
 
 // The padding to the right of the browser action buttons (between the buttons
@@ skipping 101 matching lines @@
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) {
     if (type == chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED)
       UpdateState();
     else
       NOTREACHED();
   }
 
   // ImageLoadingTracker::Observer implementation.
-  void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
-                     int index) {
-    if (image) {
-      default_skbitmap_ = *image;
-      default_icon_ = gfx::GdkPixbufFromSkBitmap(image);
+  void OnImageLoaded(const gfx::Image& image,
+                     const std::string& extension_id,
+                     int index) OVERRIDE {
+    if (!image.IsEmpty()) {
+      default_skbitmap_ = *image.ToSkBitmap();
+      default_icon_ =
+          static_cast<GdkPixbuf*>(g_object_ref(image.ToGdkPixbuf()));
     }
     UpdateState();
   }
 
   // Updates the button based on the latest state from the associated
   // browser action.
   void UpdateState() {
     int tab_id = toolbar_->GetCurrentTabId();
     if (tab_id < 0)
       return;
@@ skipping 795 matching lines @@
 
   menu->PopupAsContext(gfx::Point(event->x_root, event->y_root),
                        event->time);
   return TRUE;
 }
 
 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
   if (!resize_animation_.is_animating())
     UpdateChevronVisibility();
 }