Tweaks to the SSL InfoBubble dialog.

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"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/browser/views/toolbar_view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
-#include "views/controls/link.h"
 #include "views/controls/separator.h"
 #include "views/grid_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 namespace {
 
 // Layout constants.
 const int kHGapToBorder = 11;
 const int kVGapToImage = 10;
 const int kVGapToHeadline = 7;
 const int kHGapImageToDescription = 6;
 const int kTextPaddingRight = 10;
 const int kPaddingBelowSeparator = 4;
 const int kPaddingAboveSeparator = 13;
 const int kIconOffset = 28;
 
 // A section contains an image that shows a status (good or bad), a title, an
 // optional head-line (in bold) and a description.
 class Section : public views::View,
                 public views::LinkController {
  public:
   Section(PageInfoBubbleView* owner,
-          const PageInfoModel::SectionInfo& section_info);
+          const PageInfoModel::SectionInfo& section_info,
+          bool show_cert);
   virtual ~Section();
 
   // views::View methods:
   virtual int GetHeightForWidth(int w);
   virtual void Layout();
 
   // views::LinkController methods:
   virtual void LinkActivated(views::Link* source, int event_flags);
 
  private:
@@ skipping 30 matching lines @@
 
 PageInfoBubbleView::PageInfoBubbleView(gfx::NativeWindow parent_window,
                                        Profile* profile,
                                        const GURL& url,
                                        const NavigationEntry::SSLStatus& ssl,
                                        bool show_history)
     : ALLOW_THIS_IN_INITIALIZER_LIST(model_(profile, url, ssl,
                                             show_history, this)),
       parent_window_(parent_window),
       cert_id_(ssl.cert_id()),
-      info_bubble_(NULL) {
+      info_bubble_(NULL),
+      help_center_link_(NULL) {
   LayoutSections();
 }
 
 PageInfoBubbleView::~PageInfoBubbleView() {
 }
 
 void PageInfoBubbleView::ShowCertDialog() {
   ShowCertificateViewerByID(parent_window_, cert_id_);
 }
 
@@ skipping 10 matching lines @@
                      views::GridLayout::USE_PREF,  // Size type.
                      0,   // Ignored for USE_PREF.
                      0);  // Minimum size.
 
   int count = model_.GetSectionCount();
   for (int i = 0; i < count; ++i) {
     PageInfoModel::SectionInfo info = model_.GetSectionInfo(i);
     layout->StartRow(0, 0);
     // TODO(finnur): Remove title from the info struct, since it is
     //               not used anymore.
-    layout->AddView(new Section(this, info));
+    layout->AddView(new Section(this, info, cert_id_ > 0));
 
-    // Add separator after all sections except the last.
-    if (i < count - 1) {
-      layout->AddPaddingRow(0, kPaddingAboveSeparator);
-      layout->StartRow(0, 0);
-      layout->AddView(new views::Separator());
-      layout->AddPaddingRow(0, kPaddingBelowSeparator);
-    }
+    // Add separator after all sections.
+    layout->AddPaddingRow(0, kPaddingAboveSeparator);
+    layout->StartRow(0, 0);
+    layout->AddView(new views::Separator());
+    layout->AddPaddingRow(0, kPaddingBelowSeparator);
   }
+
+  // Then add the help center link at the bottom.
+  layout->StartRow(0, 0);
+  help_center_link_ =
+      new views::Link(l10n_util::GetString(IDS_PAGE_INFO_HELP_CENTER_LINK));
+  help_center_link_->SetController(this);
+  layout->AddView(help_center_link_);
 }
 
 gfx::Size PageInfoBubbleView::GetPreferredSize() {
   gfx::Size size(views::Window::GetLocalizedContentsSize(
       IDS_PAGEINFOBUBBLE_WIDTH_CHARS, IDS_PAGEINFOBUBBLE_HEIGHT_LINES));
   size.set_height(0);
 
   int count = model_.GetSectionCount();
   for (int i = 0; i < count; ++i) {
     PageInfoModel::SectionInfo info = model_.GetSectionInfo(i);
-    Section section(this, info);
+    Section section(this, info, cert_id_ > 0);
     size.Enlarge(0, section.GetHeightForWidth(size.width()));
   }
 
-  // Account for the separators and padding.
+  // Calculate how much space the separators take up (with padding).
   views::Separator separator;
   gfx::Size separator_size = separator.GetPreferredSize();
-  size.Enlarge(0, (count - 1) * (separator_size.height() +
-                                 kPaddingAboveSeparator +
-                                 kPaddingBelowSeparator));
+  gfx::Size separator_plus_padding(0, separator_size.height() +
+                                      kPaddingAboveSeparator +
+                                      kPaddingBelowSeparator);
+
+  // Account for the separators and padding within sections.
+  size.Enlarge(0, (count - 1) * separator_plus_padding.height());
+
+  // Account for the Help Center link and the separator above it.
+  gfx::Size link_size = help_center_link_->GetPreferredSize();
+  size.Enlarge(0, separator_plus_padding.height() +
+                  link_size.height());
+
   return size;
 }
 
 void PageInfoBubbleView::ModelChanged() {
   LayoutSections();
   info_bubble_->SizeToContents();
 }
 
+void PageInfoBubbleView::LinkActivated(views::Link* source, int event_flags) {
+  GURL url = GURL(l10n_util::GetStringUTF16(IDS_PAGE_INFO_HELP_CENTER));
+  Browser* browser = BrowserList::GetLastActive();
+  browser->OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Section
 
 Section::Section(PageInfoBubbleView* owner,
-                 const PageInfoModel::SectionInfo& section_info)
+                 const PageInfoModel::SectionInfo& section_info,
+                 bool show_cert)
     : owner_(owner),
-      info_(section_info) {
+      info_(section_info),
+      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);
   }
 
   if (info_.type == PageInfoModel::SECTION_INFO_IDENTITY ||
       info_.type == PageInfoModel::SECTION_INFO_CONNECTION) {
     status_image_ = new views::ImageView();
@@ skipping 21 matching lines @@
   AddChildView(headline_label_);
 
   description_label_ = new views::Label(UTF16ToWideHack(info_.description));
   description_label_->SetMultiLine(true);
   description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   // Allow linebreaking in the middle of words if necessary, so that extremely
   // long hostnames (longer than one line) will still be completely shown.
   description_label_->SetAllowCharacterBreak(true);
   AddChildView(description_label_);
 
-  if (info_.type == PageInfoModel::SECTION_INFO_IDENTITY) {
+  if (info_.type == PageInfoModel::SECTION_INFO_IDENTITY && show_cert) {
     link_ = new views::Link(
         l10n_util::GetString(IDS_PAGEINFO_CERT_INFO_BUTTON));
     link_->SetController(this);
     AddChildView(link_);
   }
 }
 
 Section::~Section() {
 }
 
@@ skipping 36 matching lines @@
   }
   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) {
+  if (info_.type == PageInfoModel::SECTION_INFO_IDENTITY && link_) {
     size = link_->GetPreferredSize();
     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);
 }
 
@@ skipping 18 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);
 }
 
 }