Update browserAction.setIcon and pageAction.setIcon for hidpi

chrome/browser/extensions/browser_action_test_util_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/extensions/browser_action_test_util.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/extensions/extension_popup_gtk.h"
 #include "chrome/browser/ui/gtk/extensions/extension_view_gtk.h"
 #include "chrome/browser/ui/gtk/view_id_util.h"
+#include "ui/gfx/image/image.h"
 
 namespace {
 
 GtkWidget* GetButton(Browser* browser, int index) {
   GtkWidget* toolbar =
       ViewIDUtil::GetWidget(GTK_WIDGET(browser->window()->GetNativeWindow()),
                             VIEW_ID_BROWSER_ACTION_TOOLBAR);
   GtkWidget* button = NULL;
   if (toolbar) {
     GList* children = gtk_container_get_children(GTK_CONTAINER(toolbar));
@@ skipping 18 matching lines @@
     g_list_free(children);
   }
   return count;
 }
 
 bool BrowserActionTestUtil::HasIcon(int index) {
   GtkWidget* button = GetButton(browser_, index);
   return gtk_button_get_image(GTK_BUTTON(button)) != NULL;
 }
 
+uint32 BrowserActionTestUtil::GetIconID(int index) {
+  GtkWidget* button = GetButton(browser_, index);
+  GtkWidget* image = gtk_button_get_image(GTK_BUTTON(button));
+  GdkPixbuf* pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(image));
+  // gfx::Image will unref |pixbuf| when it goes away. Pair that unref here so

[Jeffrey Yasskin, 2012/08/17 23:20:28]

"will unref" is a bit lower-level than I'd expect. Perhaps, "gfx::Image takes
ownership of a reference."

[tbarzic, 2012/08/21 00:22:07]

Done.

+  // |pixbuf| stays around.
+  g_object_ref(pixbuf);
+  return gfx::Image(pixbuf).AsBitmap().getGenerationID();

[Jeffrey Yasskin, 2012/08/17 23:20:28]

Isn't this going to return a new ID each time it's called, rather than returning
a consistent ID for a given image?
http://code.google.com/searchframe#OAMlx_jo-ck/src/third_party/skia/src/core/...

[tbarzic, 2012/08/21 00:22:07]

Yeah, you're probably right, but doesn't matter after changes to the test..

+}
+
 void BrowserActionTestUtil::Press(int index) {
   GtkWidget* button = GetButton(browser_, index);
   gtk_button_clicked(GTK_BUTTON(button));
 }
 
 std::string BrowserActionTestUtil::GetTooltip(int index) {
   GtkWidget* button = GetButton(browser_, index);
   gchar* text = gtk_widget_get_tooltip_text(button);
   std::string tooltip(text);
   g_free(text);
@@ skipping 21 matching lines @@
 // static
 gfx::Size BrowserActionTestUtil::GetMinPopupSize() {
   // On Linux we actually just limit the size of the extension view.
   return gfx::Size(ExtensionPopupGtk::kMinWidth, ExtensionPopupGtk::kMinHeight);
 }
 
 // static
 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() {
   return gfx::Size(ExtensionPopupGtk::kMaxWidth, ExtensionPopupGtk::kMaxHeight);
 }