diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 02:36:38 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 02:36:38 +0000 |
| commit | 11c36fedfc67e315e98d6bdb70480ca206157080 (patch) | |
| tree | e63a11991718ec8e3821b5d265a26d80420a135a /chrome/browser | |
| parent | 44398d26451b017063653b44bc6b5ec7975b9ced (diff) | |
| download | chromium_src-11c36fedfc67e315e98d6bdb70480ca206157080.zip chromium_src-11c36fedfc67e315e98d6bdb70480ca206157080.tar.gz chromium_src-11c36fedfc67e315e98d6bdb70480ca206157080.tar.bz2 | |
Fix linux and mac page info windows showing wrong status icons.
BUG=52916
TEST=load https://www.google.com, click on page info
Review URL: http://codereview.chromium.org/3250009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/cocoa/page_info_window_mac.mm | 3 | ||||
| -rw-r--r-- | chrome/browser/gtk/page_info_window_gtk.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/page_info_window_mac.mm b/chrome/browser/cocoa/page_info_window_mac.mm index a69fa49..306d1ed 100644 --- a/chrome/browser/cocoa/page_info_window_mac.mm +++ b/chrome/browser/cocoa/page_info_window_mac.mm @@ -221,7 +221,8 @@ void PageInfoWindowMac::LayoutSections() { scoped_nsobject<NSImageView> image_view( [[NSImageView alloc] initWithFrame:image_view_rect]); [image_view setImageFrameStyle:NSImageFrameNone]; - [image_view setImage:(info.state) ? good_image_.get() : bad_image_.get()]; + [image_view setImage:(info.state != PageInfoModel::SECTION_STATE_ERROR) ? + good_image_.get() : bad_image_.get()]; // Add the box to the list of new subviews. [box addSubview:image_view.get()]; diff --git a/chrome/browser/gtk/page_info_window_gtk.cc b/chrome/browser/gtk/page_info_window_gtk.cc index 87671ae..ef89e77 100644 --- a/chrome/browser/gtk/page_info_window_gtk.cc +++ b/chrome/browser/gtk/page_info_window_gtk.cc @@ -149,7 +149,8 @@ GtkWidget* PageInfoWindowGtk::CreateSection( GtkWidget* section_box = gtk_hbox_new(FALSE, 0); ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - GtkWidget* image = gtk_image_new_from_pixbuf(section.state ? + GtkWidget* image = gtk_image_new_from_pixbuf( + section.state != PageInfoModel::SECTION_STATE_ERROR ? rb.GetPixbufNamed(IDR_PAGEINFO_GOOD) : rb.GetPixbufNamed(IDR_PAGEINFO_BAD)); gtk_box_pack_start(GTK_BOX(section_box), image, FALSE, FALSE, |