linux: set the window icon (used in alt-tab list, etc.)

BUG=11354

Review URL: http://codereview.chromium.org/100303

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15192 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 0 deletions

diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index ceb2b56..e240182 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -206,6 +206,7 @@ BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
        full_screen_(false),
        method_factory_(this) {
   window_ = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
+  SetWindowIcon();
   SetGeometryHints();
   g_object_set_data(G_OBJECT(window_), "browser_window_gtk", this);
   g_signal_connect(window_, "delete-event",
@@ -677,6 +678,15 @@ void BrowserWindowGtk::SetGeometryHints() {
   gtk_window_set_geometry_hints(window_, NULL, &geometry, GDK_HINT_MIN_SIZE);
 }
 
+void BrowserWindowGtk::SetWindowIcon() {
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  GList* icon_list = NULL;
+  icon_list = g_list_append(icon_list, rb.GetPixbufNamed(IDR_PRODUCT_ICON_32));
+  icon_list = g_list_append(icon_list, rb.GetPixbufNamed(IDR_PRODUCT_LOGO_16));
+  gtk_window_set_icon_list(window_, icon_list);
+  g_list_free(icon_list);
+}
+
 void BrowserWindowGtk::ConnectAccelerators() {
   GtkAccelGroup* accel_group = gtk_accel_group_new();
   gtk_window_add_accel_group(window_, accel_group);
diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h
index 5cecbe7..2763df86 100644
--- a/chrome/browser/gtk/browser_window_gtk.h
+++ b/chrome/browser/gtk/browser_window_gtk.h
@@ -127,6 +127,9 @@ class BrowserWindowGtk : public BrowserWindow,
   // resize it.
   void SetGeometryHints();
 
+  // Set up the window icon (potentially used in window border or alt-tab list).
+  void SetWindowIcon();
+
   // Connect accelerators that aren't connected to menu items (like ctrl-o,
   // ctrl-l, etc.).
   void ConnectAccelerators();