diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-14 18:25:57 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-14 18:25:57 +0000 |
| commit | 05e40d9526ebb65258924b644ad738e347e5c63f (patch) | |
| tree | 0a218fc47ceb3bfabf29bf8a6ae801d74e6d063a /chrome/browser/gtk | |
| parent | 3e5004edb04012590df3497bb6d8da7f3822a12d (diff) | |
| download | chromium_src-05e40d9526ebb65258924b644ad738e347e5c63f.zip chromium_src-05e40d9526ebb65258924b644ad738e347e5c63f.tar.gz chromium_src-05e40d9526ebb65258924b644ad738e347e5c63f.tar.bz2 | |
GTK: Use themed warning icon in GTK+ theme mode.
BUG=18340
TEST=none
Review URL: http://codereview.chromium.org/551020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/location_bar_view_gtk.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index c986207..8f6b457 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -191,8 +191,7 @@ void LocationBarViewGtk::Init(bool popup_window_mode) { rb.GetPixbufNamed(IDR_LOCK)); gtk_widget_set_name(security_lock_icon_image_, "chrome-security-lock-icon"); gtk_widget_hide(GTK_WIDGET(security_lock_icon_image_)); - security_warning_icon_image_ = gtk_image_new_from_pixbuf( - rb.GetPixbufNamed(IDR_WARNING)); + security_warning_icon_image_ = gtk_image_new(); gtk_widget_set_name(security_warning_icon_image_, "chrome-security-warning-icon"); gtk_widget_hide(GTK_WIDGET(security_warning_icon_image_)); @@ -609,6 +608,10 @@ void LocationBarViewGtk::Observe(NotificationType type, gtk_util::SetLabelColor(tab_to_search_hint_leading_label_, NULL); gtk_util::SetLabelColor(tab_to_search_hint_trailing_label_, NULL); gtk_util::SetLabelColor(type_to_search_hint_, NULL); + + gtk_image_set_from_stock(GTK_IMAGE(security_warning_icon_image_), + GTK_STOCK_DIALOG_WARNING, + GTK_ICON_SIZE_SMALL_TOOLBAR); } else { gtk_widget_modify_bg(tab_to_search_box_, GTK_STATE_NORMAL, &kKeywordBackgroundColor); @@ -622,6 +625,10 @@ void LocationBarViewGtk::Observe(NotificationType type, gtk_util::SetLabelColor(tab_to_search_hint_trailing_label_, &kHintTextColor); gtk_util::SetLabelColor(type_to_search_hint_, &kHintTextColor); + + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); + gtk_image_set_from_pixbuf(GTK_IMAGE(security_warning_icon_image_), + rb.GetPixbufNamed(IDR_WARNING)); } } |