Page info model now shows red skull and crossbones on SECURITY_STYLE_AUTHENTI...

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/browser_list.h"
@@ skipping 43 matching lines @@
  private:
   // Calculate the layout if |compute_bounds_only|, otherwise does Layout also.
   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,
                                        bool show_history)
@@ skipping 92 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Section
 
 Section::Section(PageInfoBubbleView* owner,
                  const PageInfoModel::SectionInfo& section_info,
                  bool show_cert)
     : owner_(owner),
       info_(section_info),
+      status_image_(NULL),
       link_(NULL) {
-  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);
-  }
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   if (info_.type == PageInfoModel::SECTION_INFO_IDENTITY ||
       info_.type == PageInfoModel::SECTION_INFO_CONNECTION) {
     status_image_ = new views::ImageView();
     switch (info_.state) {
       case PageInfoModel::SECTION_STATE_OK:
-        status_image_->SetImage(good_state_icon_);
+        status_image_->SetImage(rb.GetBitmapNamed(IDR_PAGEINFO_GOOD));
         break;
-      case PageInfoModel::SECTION_STATE_WARNING:
-        DCHECK(info_.type == PageInfoModel::SECTION_INFO_CONNECTION);
-        status_image_->SetImage(mixed_state_icon_);
+      case PageInfoModel::SECTION_STATE_WARNING_MAJOR:
+        status_image_->SetImage(rb.GetBitmapNamed(IDR_PAGEINFO_WARNING_MAJOR));
+        break;
+      case PageInfoModel::SECTION_STATE_WARNING_MINOR:
+        status_image_->SetImage(rb.GetBitmapNamed(IDR_PAGEINFO_WARNING_MINOR));
         break;
       case PageInfoModel::SECTION_STATE_ERROR:
-        status_image_->SetImage(bad_state_icon_);
+        status_image_->SetImage(rb.GetBitmapNamed(IDR_PAGEINFO_BAD));
         break;
       default:
         NOTREACHED();  // Do you need to add a case here?
     }
     AddChildView(status_image_);
+  } else if (info_.type == PageInfoModel::SECTION_INFO_FIRST_VISIT) {
+    status_image_ = new views::ImageView();
+    status_image_->SetImage(info_.state == PageInfoModel::SECTION_STATE_OK ?
+        rb.GetBitmapNamed(IDR_PAGEINFO_INFO) :
+        rb.GetBitmapNamed(IDR_PAGEINFO_WARNING_MAJOR));
+    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));
   description_label_->SetMultiLine(true);
@@ skipping 25 matching lines @@
 void Section::LinkActivated(views::Link* source, int event_flags) {
   owner_->ShowCertDialog();
 }
 
 gfx::Size Section::LayoutItems(bool compute_bounds_only, int width) {
   int x = kHGapToBorder;
   int y = kVGapToImage;
 
   // Layout the image, head-line and description.
   gfx::Size size;
-  if (info_.type == PageInfoModel::SECTION_INFO_IDENTITY ||
-    info_.type == PageInfoModel::SECTION_INFO_CONNECTION) {
+  if (status_image_) {
       size = status_image_->GetPreferredSize();
     if (!compute_bounds_only)
       status_image_->SetBounds(x, y, size.width(), size.height());
   }
   int image_height = y + size.height();
   x += size.width() + kHGapImageToDescription;
   int w = width - x - kTextPaddingRight;
   y = kVGapToHeadline;
   if (!headline_label_->GetText().empty()) {
     size = headline_label_->GetPreferredSize();
     if (!compute_bounds_only)
       headline_label_->SetBounds(x, y, w > 0 ? w : 0, size.height());
     y += size.height();
   } else {
     if (!compute_bounds_only)
       headline_label_->SetBounds(x, y, 0, 0);
   }
   if (w > 0) {
     int height = description_label_->GetHeightForWidth(w);
     if (!compute_bounds_only)
       description_label_->SetBounds(x, y, w, height);
     y += height;
   } else {
     if (!compute_bounds_only)
       description_label_->SetBounds(x, y, 0, 0);
   }
   if (info_.type == PageInfoModel::SECTION_INFO_IDENTITY && link_) {
     size = link_->GetPreferredSize();
-    link_->SetBounds(x, y, size.width(), size.height());
+    if (!compute_bounds_only)
+      link_->SetBounds(x, y, size.width(), size.height());
     y += size.height();
   }
 
   // Make sure the image is not truncated if the text doesn't contain much.
   y = std::max(y, image_height);
   return gfx::Size(width, y);
 }
 
 namespace browser {
 
@@ skipping 20 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);
 }
 
 }