diff options
| -rw-r--r-- | chrome/browser/cocoa/page_info_window_mac.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/gtk/page_info_window_gtk.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/views/page_info_bubble_view.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/views/page_info_window_view.cc | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/page_info_window_mac.mm b/chrome/browser/cocoa/page_info_window_mac.mm index 306d1ed..c98e357 100644 --- a/chrome/browser/cocoa/page_info_window_mac.mm +++ b/chrome/browser/cocoa/page_info_window_mac.mm @@ -221,7 +221,7 @@ void PageInfoWindowMac::LayoutSections() { scoped_nsobject<NSImageView> image_view( [[NSImageView alloc] initWithFrame:image_view_rect]); [image_view setImageFrameStyle:NSImageFrameNone]; - [image_view setImage:(info.state != PageInfoModel::SECTION_STATE_ERROR) ? + [image_view setImage:(info.state == PageInfoModel::SECTION_STATE_OK) ? good_image_.get() : bad_image_.get()]; // Add the box to the list of new subviews. diff --git a/chrome/browser/gtk/page_info_window_gtk.cc b/chrome/browser/gtk/page_info_window_gtk.cc index ef89e77..02ed593 100644 --- a/chrome/browser/gtk/page_info_window_gtk.cc +++ b/chrome/browser/gtk/page_info_window_gtk.cc @@ -150,7 +150,7 @@ GtkWidget* PageInfoWindowGtk::CreateSection( GtkWidget* section_box = gtk_hbox_new(FALSE, 0); ResourceBundle& rb = ResourceBundle::GetSharedInstance(); GtkWidget* image = gtk_image_new_from_pixbuf( - section.state != PageInfoModel::SECTION_STATE_ERROR ? + section.state == PageInfoModel::SECTION_STATE_OK ? rb.GetPixbufNamed(IDR_PAGEINFO_GOOD) : rb.GetPixbufNamed(IDR_PAGEINFO_BAD)); gtk_box_pack_start(GTK_BOX(section_box), image, FALSE, FALSE, diff --git a/chrome/browser/views/page_info_bubble_view.cc b/chrome/browser/views/page_info_bubble_view.cc index b7ca272..bfdafc6 100644 --- a/chrome/browser/views/page_info_bubble_view.cc +++ b/chrome/browser/views/page_info_bubble_view.cc @@ -310,10 +310,14 @@ void ShowPageInfoBubble(gfx::NativeWindow parent, // Find where to point the bubble at. BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(parent); - gfx::Rect bounds = browser_view->toolbar()->location_bar()->bounds(); gfx::Point point; + if (base::i18n::IsRTL()) { + int width = browser_view->toolbar()->location_bar()->width(); + point = gfx::Point(width - kIconOffset, 0); + } views::View::ConvertPointToScreen(browser_view->toolbar()->location_bar(), &point); + gfx::Rect bounds = browser_view->toolbar()->location_bar()->bounds(); bounds.set_origin(point); bounds.set_width(kIconOffset); diff --git a/chrome/browser/views/page_info_window_view.cc b/chrome/browser/views/page_info_window_view.cc index 690fc9a..4b65c7a 100644 --- a/chrome/browser/views/page_info_window_view.cc +++ b/chrome/browser/views/page_info_window_view.cc @@ -218,7 +218,7 @@ void PageInfoWindowView::LayoutSections() { PageInfoModel::SectionInfo info = model_.GetSectionInfo(i); layout->StartRow(0, 0); layout->AddView(new Section( - info.title, info.state != PageInfoModel::SECTION_STATE_ERROR, + info.title, info.state == PageInfoModel::SECTION_STATE_OK, info.headline, info.description)); layout->AddPaddingRow(0, kVerticalPadding); } |