diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 03:09:20 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 03:09:20 +0000 |
| commit | 8a1d601fcd2f8bf457ea4e9592e918acc9835f87 (patch) | |
| tree | bb81b5e64646e1e1e22b0402cdda7010dcaaf6fe /chrome | |
| parent | 28402908e9e331ccb139a9eb709ddd8f838b9440 (diff) | |
| download | chromium_src-8a1d601fcd2f8bf457ea4e9592e918acc9835f87.zip chromium_src-8a1d601fcd2f8bf457ea4e9592e918acc9835f87.tar.gz chromium_src-8a1d601fcd2f8bf457ea4e9592e918acc9835f87.tar.bz2 | |
forgot a file (or rather gcl was hiding it in another cl)
TBR=evan
Review URL: http://codereview.chromium.org/149787
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index db15bd9..c4d5299 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -52,6 +52,7 @@ #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" +#include "chrome/common/gtk_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" @@ -213,6 +214,7 @@ const struct AcceleratorMapping { { GDK_r, IDC_RELOAD, GDK_CONTROL_MASK }, { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, { GDK_F5, IDC_RELOAD, GDK_CONTROL_MASK }, + { GDK_F5, IDC_RELOAD, GDK_SHIFT_MASK }, { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, @@ -386,7 +388,7 @@ BrowserWindowGtk::BrowserWindowGtk(Browser* browser) gtk_widget_add_events(GTK_WIDGET(window_), GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK); - SetWindowIcon(); + gtk_util::SetWindowIcon(window_); SetBackgroundColor(); SetGeometryHints(); ConnectHandlersToSignals(); @@ -1037,15 +1039,6 @@ void BrowserWindowGtk::SetGeometryHints() { gtk_window_resize(window_, bounds.width(), bounds.height()); } -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::ConnectHandlersToSignals() { g_signal_connect(window_, "delete-event", G_CALLBACK(MainWindowDeleteEvent), this); |