Rebase PageInfoBubble on the new views bubble.

chrome/browser/ui/views/page_info_bubble_view.cc

 // Copyright (c) 2011 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/ui/views/page_info_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
@@ skipping 12 matching lines @@
 #include "ui/gfx/image/image.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/separator.h"
 #include "views/layout/grid_layout.h"
 #include "views/widget/widget.h"
 
 namespace {
 
+// TODO(msw): Get color from theme/window color.
+const SkColor kColor = SK_ColorWHITE;
+
 // Layout constants.
 const int kHGapToBorder = 11;
 const int kVerticalSectionPadding = 8;
 const int kVGapToHeadline = 5;
 const int kHGapImageToDescription = 6;
 const int kTextPaddingRight = 10;
 const int kPaddingBelowSeparator = 6;
 const int kPaddingAboveSeparator = 4;
 const int kIconHorizontalOffset = 27;
 const int kIconVerticalOffset = -7;
@@ skipping 48 matching lines @@
   double animation_value_;
 
   DISALLOW_COPY_AND_ASSIGN(Section);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // PageInfoBubbleView
 
-Bubble* PageInfoBubbleView::bubble_ = NULL;
-
-PageInfoBubbleView::PageInfoBubbleView(gfx::NativeWindow parent_window,
+PageInfoBubbleView::PageInfoBubbleView(views::View* anchor_view,
                                        Profile* profile,
                                        const GURL& url,
                                        const NavigationEntry::SSLStatus& ssl,
                                        bool show_history)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(model_(profile, url, ssl,
+    : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_LEFT, kColor),
+      ALLOW_THIS_IN_INITIALIZER_LIST(model_(profile, url, ssl,
                                             show_history, this)),
-      parent_window_(parent_window),
       cert_id_(ssl.cert_id()),
       help_center_link_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(resize_animation_(this)),
       animation_start_height_(0) {
-  if (bubble_)
-    bubble_->Close();
+
   if (cert_id_ > 0) {
     scoped_refptr<net::X509Certificate> cert;
     CertStore::GetInstance()->RetrieveCert(cert_id_, &cert);
     // When running with fake certificate (Chrome Frame), we have no os
     // certificate, so there is no cert to show. Don't bother showing the cert
     // info link in that case.
     if (!cert.get() || !cert->os_cert_handle())
       cert_id_ = 0;
   }
   LayoutSections();
 }
 
 PageInfoBubbleView::~PageInfoBubbleView() {
+  resize_animation_.Reset();
 }
 
 void PageInfoBubbleView::ShowCertDialog() {
-  ShowCertificateViewerByID(parent_window_, cert_id_);
+  gfx::NativeWindow parent =
+    anchor_view() ? anchor_view()->GetWidget()->GetNativeWindow() : NULL;

[Ben Goodger (Google), 2011/11/16 22:26:38]

nit: 4-space indent

[msw, 2011/11/16 22:37:53]

Done.

+  ShowCertificateViewerByID(parent, cert_id_);
 }
 
 gfx::Size PageInfoBubbleView::GetSeparatorSize() {
   // Calculate how much space the separators take up (with padding).
   views::Separator separator;
   gfx::Size separator_size = separator.GetPreferredSize();
   gfx::Size separator_plus_padding(0, separator_size.height() +
                                       kPaddingAboveSeparator +
                                       kPaddingBelowSeparator);
   return separator_plus_padding;
@@ skipping 137 matching lines @@
   // _NET_WM_SYNC_REQUEST messages to clients before resizing to ask for notice
   // after the window has been repainted at the new size.  Chrome appears to
   // fall behind in handling the repaints, and the sync request responses
   // typically don't get sent back to the window manager until the animation is
   // done, which results in the window being invisible until then:
   // http://crosbug.com/14993.  Trying to e.g. just animate the first-visit
   // section's opacity has the same negative effect, so we avoid doing any
   // animation.
   // TODO(derat): Remove this once we're not using a toplevel X window for the
   // bubble.
-  bubble_->SizeToContents();
+  SizeToContents();
 #else
   resize_animation_.SetSlideDuration(kPageInfoSlideDuration);
   resize_animation_.Show();
 #endif
 }
 
-void PageInfoBubbleView::BubbleClosing(Bubble* bubble, bool closed_by_escape) {
-  resize_animation_.Reset();
-  bubble_ = NULL;
-}
-
-bool PageInfoBubbleView::CloseOnEscape() {
-  return true;
-}
-
-bool PageInfoBubbleView::FadeInOnShow() {
-  return false;
-}
-
-string16 PageInfoBubbleView::GetAccessibleName() {
-  return ASCIIToUTF16("PageInfoBubble");
+gfx::Point PageInfoBubbleView::GetAnchorPoint() {
+  // Compensate for some built-in padding in the icon.
+  gfx::Point anchor(BubbleDelegateView::GetAnchorPoint());
+  return anchor_view() ? anchor.Subtract(gfx::Point(0, 5)) : anchor;
 }
 
 void PageInfoBubbleView::LinkClicked(views::Link* source, int event_flags) {
-  // We want to make sure the info bubble closes once the link is activated.  So
-  // we close it explicitly rather than relying on a side-effect of opening a
-  // new tab (see http://crosbug.com/10186).
-  bubble_->Close();
-
   GURL url = google_util::AppendGoogleLocaleParam(
       GURL(chrome::kPageInfoHelpCenterURL));
   Browser* browser = BrowserList::GetLastActive();
   browser->OpenURL(
       url, GURL(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
+  // NOTE: The bubble closes automatically on deactivation as the link opens.
 }
 
 void PageInfoBubbleView::AnimationEnded(const ui::Animation* animation) {
-  LayoutSections();
-  bubble_->SizeToContents();
+  if (animation == &resize_animation_) {
+    LayoutSections();
+    SizeToContents();
+  }
+  BubbleDelegateView::AnimationEnded(animation);
 }
 
 void PageInfoBubbleView::AnimationProgressed(const ui::Animation* animation) {
-  LayoutSections();
-  bubble_->SizeToContents();
+  if (animation == &resize_animation_) {
+    LayoutSections();
+    SizeToContents();
+  }
+  BubbleDelegateView::AnimationProgressed(animation);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Section
 
 Section::Section(PageInfoBubbleView* owner,
                  const PageInfoModel::SectionInfo& section_info,
                  const SkBitmap* state_icon,
                  bool show_cert)
     : owner_(owner),
@@ skipping 124 matching lines @@
     y += size.height();
   }
 
   // Make sure the image is not truncated if the text doesn't contain much.
   y = std::max(y, (2 * kVerticalSectionPadding) + image_height);
   return gfx::Size(width, y);
 }
 
 namespace browser {
 
-void ShowPageInfoBubble(BrowserView* browser_view,
+void ShowPageInfoBubble(views::View* anchor_view,
                         Profile* profile,
                         const GURL& url,
                         const NavigationEntry::SSLStatus& ssl,
                         bool show_history) {
-  // Find where to point the bubble at.
-  gfx::Point point;
-  if (base::i18n::IsRTL()) {
-    int width = browser_view->toolbar()->location_bar()->width();
-    point = gfx::Point(width - kIconHorizontalOffset, 0);
-  }
-  point.Offset(0, kIconVerticalOffset);
-  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(kIconHorizontalOffset);
+  PageInfoBubbleView* page_info_bubble =
+      new PageInfoBubbleView(anchor_view, profile, url, ssl, show_history);
+  views::BubbleDelegateView::CreateBubble(page_info_bubble);
+  page_info_bubble->Show();
+}
 
-  // Show the bubble. If the bubble already exist - it will be closed first.
-  PageInfoBubbleView* page_info_bubble =
-      new PageInfoBubbleView(browser_view->GetNativeHandle(),
-                             profile, url, ssl, show_history);
-  Bubble* bubble =
-      Bubble::Show(browser_view->GetWidget(), bounds,
-                   views::BubbleBorder::TOP_LEFT,
-                   views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR,
-                   page_info_bubble, page_info_bubble);
-  page_info_bubble->set_bubble(bubble);
 }
-}