Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8732)

Unified Diff: chrome/browser/views/page_info_bubble_view.cc

Issue 3171031: Add mixed content warning to the Page Info bubble.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/page_info_model.cc ('k') | chrome/browser/views/page_info_window_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/page_info_bubble_view.cc
===================================================================
--- chrome/browser/views/page_info_bubble_view.cc (revision 57510)
+++ chrome/browser/views/page_info_bubble_view.cc (working copy)
@@ -62,6 +62,7 @@
static SkBitmap* good_state_icon_;
static SkBitmap* bad_state_icon_;
+ static SkBitmap* mixed_state_icon_;
views::ImageView* status_image_;
views::Label* headline_label_;
@@ -74,6 +75,7 @@
// static
SkBitmap* Section::good_state_icon_ = NULL;
SkBitmap* Section::bad_state_icon_ = NULL;
+SkBitmap* Section::mixed_state_icon_ = NULL;
} // namespace
@@ -169,12 +171,26 @@
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
good_state_icon_ = rb.GetBitmapNamed(IDR_PAGEINFO_GOOD);
bad_state_icon_ = rb.GetBitmapNamed(IDR_PAGEINFO_BAD);
+ mixed_state_icon_ = rb.GetBitmapNamed(IDR_PAGEINFO_MIXED);
}
if (info_.type == PageInfoModel::SECTION_INFO_IDENTITY ||
info_.type == PageInfoModel::SECTION_INFO_CONNECTION) {
status_image_ = new views::ImageView();
- status_image_->SetImage(info_.state ? good_state_icon_ : bad_state_icon_);
+ switch (info_.state) {
+ case PageInfoModel::SECTION_STATE_OK:
+ status_image_->SetImage(good_state_icon_);
+ break;
+ case PageInfoModel::SECTION_STATE_WARNING:
+ DCHECK(info_.type == PageInfoModel::SECTION_INFO_CONNECTION);
+ status_image_->SetImage(mixed_state_icon_);
+ break;
+ case PageInfoModel::SECTION_STATE_ERROR:
+ status_image_->SetImage(bad_state_icon_);
+ break;
+ default:
+ NOTREACHED(); // Do you need to add a case here?
+ }
AddChildView(status_image_);
}
« no previous file with comments | « chrome/browser/page_info_model.cc ('k') | chrome/browser/views/page_info_window_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698