Rebase PageInfoBubble on the new views bubble.

views/bubble/bubble_delegate.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 "views/bubble/bubble_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "views/bubble/bubble_frame_view.h"
 #include "views/widget/widget.h"
 
@@ skipping 91 matching lines @@
 }
 
 BubbleDelegateView::~BubbleDelegateView() {
   if (border_widget_)
     border_widget_->Close();
 }
 
 // static
 Widget* BubbleDelegateView::CreateBubble(BubbleDelegateView* bubble_delegate) {
   bubble_delegate->Init();
-  Widget* parent_widget = bubble_delegate->anchor_view() ?
+  Widget* parent = bubble_delegate->anchor_view() ?
       bubble_delegate->anchor_view()->GetWidget() : NULL;
-  Widget* bubble_widget = CreateBubbleWidget(bubble_delegate, parent_widget);
+  Widget* bubble_widget = CreateBubbleWidget(bubble_delegate, parent);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // First set the contents view to initialize view bounds for widget sizing.
   bubble_widget->SetContentsView(bubble_delegate->GetContentsView());
-  bubble_delegate->InitializeBorderWidget(parent_widget);
-  bubble_widget->SetBounds(bubble_delegate->GetBubbleClientBounds());
-#else
-  bubble_widget->SetBounds(bubble_delegate->GetBubbleBounds());
+  bubble_delegate->border_widget_ = CreateBorderWidget(bubble_delegate, parent);
 #endif
 
+  bubble_delegate->SizeToContents();
   bubble_widget->AddObserver(bubble_delegate);
-  if (parent_widget && parent_widget->GetTopLevelWidget())
-    parent_widget->GetTopLevelWidget()->DisableInactiveRendering();
+  if (parent && parent->GetTopLevelWidget())
+    parent->GetTopLevelWidget()->DisableInactiveRendering();
   return bubble_widget;
 }
 
 View* BubbleDelegateView::GetInitiallyFocusedView() {
   return this;
 }
 
 BubbleDelegateView* BubbleDelegateView::AsBubbleDelegate() {
   return this;
 }
@@ skipping 78 matching lines @@
 bool BubbleDelegateView::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   if (!close_on_esc() || accelerator.key_code() != ui::VKEY_ESCAPE)
     return false;
   if (fade_animation_.get())
     fade_animation_->Reset();
   GetWidget()->Close();
   return true;
 }
 
-void BubbleDelegateView::Init() {}
-
 void BubbleDelegateView::AnimationEnded(const ui::Animation* animation) {
-  DCHECK_EQ(animation, fade_animation_.get());
+  if (animation != fade_animation_.get())
+    return;
   bool closed = fade_animation_->GetCurrentValue() == 0;
   fade_animation_->Reset();
   if (closed)
     GetWidget()->Close();
 }
 
 void BubbleDelegateView::AnimationProgressed(const ui::Animation* animation) {
-  DCHECK_EQ(animation, fade_animation_.get());
+  if (animation != fade_animation_.get())
+    return;
   DCHECK(fade_animation_->is_animating());
   unsigned char opacity = fade_animation_->GetCurrentValue() * 255;
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Explicitly set the content Widget's layered style and set transparency via
   // SetLayeredWindowAttributes. This is done because initializing the Widget as
   // transparent and setting opacity via UpdateLayeredWindow doesn't support
   // hosting child native Windows controls.
   const HWND hwnd = GetWidget()->GetNativeView();
   const DWORD style = GetWindowLong(hwnd, GWL_EXSTYLE);
   if ((opacity == 255) == !!(style & WS_EX_LAYERED))
     SetWindowLong(hwnd, GWL_EXSTYLE, style ^ WS_EX_LAYERED);
   SetLayeredWindowAttributes(hwnd, 0, opacity, LWA_ALPHA);
   // Update the border widget's opacity.
   border_widget_->SetOpacity(opacity);
   border_widget_->non_client_view()->SchedulePaint();
 #endif
   GetWidget()->SetOpacity(opacity);
   SchedulePaint();
 }
 
+void BubbleDelegateView::Init() {}
+
+void BubbleDelegateView::SizeToContents() {
+#if defined(OS_WIN) && !defined(USE_AURA)
+  border_widget_->SetBounds(GetBubbleBounds());
+  GetWidget()->SetBounds(GetBubbleClientBounds());
+#else
+  GetWidget()->SetBounds(GetBubbleBounds());
+#endif
+}
+
 BubbleFrameView* BubbleDelegateView::GetBubbleFrameView() const {
   const Widget* widget = border_widget_ ? border_widget_ : GetWidget();
   return static_cast<BubbleFrameView*>(widget->non_client_view()->frame_view());
 }
 
 gfx::Rect BubbleDelegateView::GetBubbleBounds() {
   // The argument rect has its origin at the bubble's arrow anchor point;
   // its size is the preferred size of the bubble's client view (this view).
   return GetBubbleFrameView()->GetWindowBoundsForClientBounds(
       gfx::Rect(GetAnchorPoint(), GetPreferredSize()));
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
-void BubbleDelegateView::InitializeBorderWidget(Widget* parent_widget) {
-  border_widget_ = CreateBorderWidget(this, parent_widget);
-  border_widget_->SetBounds(GetBubbleBounds());
-}
-
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(border_widget_->GetWindowScreenBounds().origin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views