GTK: Use stock icons for bookmark folder and default favicon....

chrome/browser/gtk/bookmark_utils_gtk.cc

 // Copyright (c) 2009 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/gtk/bookmark_utils_gtk.h"
 
 #include "app/resource_bundle.h"
 #include "base/gfx/gtk_util.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
@@ skipping 27 matching lines @@
 // to give the bookmark bar more space (at the expense of the toolbar).
 const int kButtonPaddingTop = 0;
 const int kButtonPaddingBottom = 0;
 const int kButtonPaddingLeft = 2;
 const int kButtonPaddingRight = 0;
 
 void* AsVoid(const BookmarkNode* node) {
   return const_cast<BookmarkNode*>(node);
 }
 
+// This is a dummy widget that only exists so we have something to pass to
+// gtk_widget_render_icon().
+GtkWidget* icon_widget = NULL;
+
 }  // namespace
 
 namespace bookmark_utils {
 
 const char kBookmarkNode[] = "bookmark-node";
 
 // Spacing between the buttons on the bar.
 const int kBarButtonPadding = 4;
 
-GdkPixbuf* GetFolderIcon() {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  static GdkPixbuf* default_folder_icon = rb.GetPixbufNamed(
-      IDR_BOOKMARK_BAR_FOLDER);
-  return default_folder_icon;
+GdkPixbuf* GetFolderIcon(bool native) {
+  if (!native) {
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    static GdkPixbuf* default_folder_icon = rb.GetPixbufNamed(
+        IDR_BOOKMARK_BAR_FOLDER);
+    return default_folder_icon;
+  } else {
+    if (!icon_widget)
+      icon_widget = gtk_fixed_new();
+    // We never release our ref, so we will leak this on program shutdown.
+    static GdkPixbuf* default_folder_icon =
+        gtk_widget_render_icon(icon_widget, GTK_STOCK_DIRECTORY,
+                               GTK_ICON_SIZE_MENU, NULL);
+    return default_folder_icon;
+  }
 }
 
-GdkPixbuf* GetDefaultFavicon() {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  static GdkPixbuf* default_bookmark_icon = rb.GetPixbufNamed(
-      IDR_DEFAULT_FAVICON);
-  return default_bookmark_icon;
+GdkPixbuf* GetDefaultFavicon(bool native) {
+  if (!native) {
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    static GdkPixbuf* default_bookmark_icon = rb.GetPixbufNamed(
+        IDR_DEFAULT_FAVICON);
+    return default_bookmark_icon;
+  } else {
+    if (!icon_widget)
+      icon_widget = gtk_fixed_new();
+    // We never release our ref, so we will leak this on program shutdown.
+    static GdkPixbuf* default_bookmark_icon =
+        gtk_widget_render_icon(icon_widget, GTK_STOCK_FILE,
+                               GTK_ICON_SIZE_MENU, NULL);
+    return default_bookmark_icon;
+  }
 }
 
-GdkPixbuf* GetPixbufForNode(const BookmarkNode* node, BookmarkModel* model) {
+GdkPixbuf* GetPixbufForNode(const BookmarkNode* node, BookmarkModel* model,
+                            bool native) {
   GdkPixbuf* pixbuf;
 
   if (node->is_url()) {
     if (model->GetFavIcon(node).width() != 0) {
       pixbuf = gfx::GdkPixbufFromSkBitmap(&model->GetFavIcon(node));
     } else {
-      pixbuf = GetDefaultFavicon();
+      pixbuf = GetDefaultFavicon(native);
       g_object_ref(pixbuf);
     }
   } else {
-    pixbuf = GetFolderIcon();
+    pixbuf = GetFolderIcon(native);
     g_object_ref(pixbuf);
   }
 
   return pixbuf;
 }
 
 GtkWidget* GetDragRepresentation(const BookmarkNode* node,
                                  BookmarkModel* model,
                                  GtkThemeProvider* provider) {
   // Build a windowed representation for our button.
@@ skipping 24 matching lines @@
   GtkWidget* former_child = gtk_bin_get_child(GTK_BIN(button));
   if (former_child)
     gtk_container_remove(GTK_CONTAINER(button), former_child);
 
   std::string tooltip = BuildTooltipFor(node);
   if (!tooltip.empty())
     gtk_widget_set_tooltip_text(button, tooltip.c_str());
 
   // We pack the button manually (rather than using gtk_button_set_*) so that
   // we can have finer control over its label.
-  GdkPixbuf* pixbuf = bookmark_utils::GetPixbufForNode(node, model);
+  GdkPixbuf* pixbuf = bookmark_utils::GetPixbufForNode(node, model,
+                                                       provider->UseGtkTheme());
   GtkWidget* image = gtk_image_new_from_pixbuf(pixbuf);
   g_object_unref(pixbuf);
 
   GtkWidget* box = gtk_hbox_new(FALSE, kBarButtonPadding);
   gtk_box_pack_start(GTK_BOX(box), image, FALSE, FALSE, 0);
 
   std::string label_string = WideToUTF8(node->GetTitle());
   if (!label_string.empty()) {
     GtkWidget* label = gtk_label_new(label_string.c_str());
     gtk_label_set_max_width_chars(GTK_LABEL(label), kMaxCharsOnAButton);
@@ skipping 154 matching lines @@
     GURL url(uris[i]);
     std::string title = GetNameForURL(url);
     model->AddURL(parent, idx++, UTF8ToWide(title), url);
   }
 
   g_strfreev(uris);
   return true;
 }
 
 }  // namespace bookmark_utils