Add mixed content warning to the Page Info bubble....

chrome/browser/views/page_info_bubble_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/page_info_bubble_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
@@ skipping 44 matching lines @@
   gfx::Size LayoutItems(bool compute_bounds_only, int width);
 
   // The view that owns this Section object.
   PageInfoBubbleView* owner_;
 
   // The information this view represents.
   PageInfoModel::SectionInfo info_;
 
   static SkBitmap* good_state_icon_;
   static SkBitmap* bad_state_icon_;
+  static SkBitmap* mixed_state_icon_;
 
   views::ImageView* status_image_;
   views::Label* headline_label_;
   views::Label* description_label_;
   views::Link* link_;
 
   DISALLOW_COPY_AND_ASSIGN(Section);
 };
 
 // static
 SkBitmap* Section::good_state_icon_ = NULL;
 SkBitmap* Section::bad_state_icon_ = NULL;
+SkBitmap* Section::mixed_state_icon_ = NULL;
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // PageInfoBubbleView
 
 PageInfoBubbleView::PageInfoBubbleView(gfx::NativeWindow parent_window,
                                        Profile* profile,
                                        const GURL& url,
                                        const NavigationEntry::SSLStatus& ssl,
@@ skipping 75 matching lines @@
 // Section
 
 Section::Section(PageInfoBubbleView* owner,
                  const PageInfoModel::SectionInfo& section_info)
     : owner_(owner),
       info_(section_info) {
   if (!good_state_icon_) {
     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_);
   }
 
   headline_label_ = new views::Label(UTF16ToWideHack(info_.headline));
   headline_label_->SetFont(
       headline_label_->font().DeriveFont(0, gfx::Font::BOLD));
   headline_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(headline_label_);
 
   description_label_ = new views::Label(UTF16ToWideHack(info_.description));
@@ skipping 93 matching lines @@
   PageInfoBubbleView* page_info_bubble =
       new PageInfoBubbleView(parent, profile, url, ssl, show_history);
   InfoBubble* info_bubble =
       InfoBubble::Show(browser_view->GetWidget(), bounds,
                        BubbleBorder::TOP_LEFT,
                        page_info_bubble, page_info_bubble);
   page_info_bubble->set_info_bubble(info_bubble);
 }
 
 }