diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 03:01:51 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 03:01:51 +0000 |
| commit | 28402908e9e331ccb139a9eb709ddd8f838b9440 (patch) | |
| tree | 9ce4b129f48ac01589b9d1ffd10c35a2f21c2b5a /chrome/browser | |
| parent | 11c9f1e5edf0674382f45ad830fed191895c3a9d (diff) | |
| download | chromium_src-28402908e9e331ccb139a9eb709ddd8f838b9440.zip chromium_src-28402908e9e331ccb139a9eb709ddd8f838b9440.tar.gz chromium_src-28402908e9e331ccb139a9eb709ddd8f838b9440.tar.bz2 | |
Set window icon on options dialog, bookmark manager.
BUG=16951
TEST=launch bookmark manager on gnome/metacity, observe that window has icon
Review URL: http://codereview.chromium.org/155672
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/gtk/bookmark_manager_gtk.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.h | 3 | ||||
| -rw-r--r-- | chrome/browser/gtk/options/options_window_gtk.cc | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc index eea1bbc..9ccad4d 100644 --- a/chrome/browser/gtk/bookmark_manager_gtk.cc +++ b/chrome/browser/gtk/bookmark_manager_gtk.cc @@ -302,6 +302,7 @@ BookmarkManagerGtk::BookmarkManagerGtk(Profile* profile) delaying_mousedown_(false), sending_delayed_mousedown_(false) { InitWidgets(); + gtk_util::SetWindowIcon(GTK_WINDOW(window_)); g_signal_connect(window_, "destroy", G_CALLBACK(OnWindowDestroy), this); diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h index b15c9fc..a5239c3 100644 --- a/chrome/browser/gtk/browser_window_gtk.h +++ b/chrome/browser/gtk/browser_window_gtk.h @@ -183,9 +183,6 @@ 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 to signals on |window_|. void ConnectHandlersToSignals(); diff --git a/chrome/browser/gtk/options/options_window_gtk.cc b/chrome/browser/gtk/options/options_window_gtk.cc index 349615d..d155d38 100644 --- a/chrome/browser/gtk/options/options_window_gtk.cc +++ b/chrome/browser/gtk/options/options_window_gtk.cc @@ -99,6 +99,7 @@ OptionsWindowGtk::OptionsWindowGtk(Profile* profile) gtk_window_set_default_size(GTK_WINDOW(dialog_), 500, -1); gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox), gtk_util::kContentAreaSpacing); + gtk_util::SetWindowIcon(GTK_WINDOW(dialog_)); notebook_ = gtk_notebook_new(); |