Rebase BookmarkBubble 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 59 matching lines @@
   return border_widget;
 }
 #endif
 
 }  // namespace
 
 BubbleDelegateView::BubbleDelegateView()
     : close_on_esc_(true),
       close_on_deactivate_(true),
       allow_bubble_offscreen_(false),
+      anchor_view_(NULL),
       arrow_location_(BubbleBorder::TOP_LEFT),
       color_(SK_ColorWHITE),
       border_widget_(NULL),
       use_focusless_(false) {
   set_background(views::Background::CreateSolidBackground(color_));
   AddAccelerator(Accelerator(ui::VKEY_ESCAPE, 0));
 }
 
 BubbleDelegateView::BubbleDelegateView(
-    const gfx::Point& anchor_point,
+    View* anchor_view,
     BubbleBorder::ArrowLocation arrow_location,
     const SkColor& color)
     : close_on_esc_(true),
       close_on_deactivate_(true),
       allow_bubble_offscreen_(false),
-      anchor_point_(anchor_point),
+      anchor_view_(anchor_view),
       arrow_location_(arrow_location),
       color_(color),
       original_opacity_(255),
       border_widget_(NULL),
       use_focusless_(false) {
   set_background(views::Background::CreateSolidBackground(color_));
   AddAccelerator(Accelerator(ui::VKEY_ESCAPE, 0));
 }
 
 BubbleDelegateView::~BubbleDelegateView() {
   if (border_widget_)
     border_widget_->Close();
 }
 
 // static
-Widget* BubbleDelegateView::CreateBubble(BubbleDelegateView* bubble_delegate,
-                                         Widget* parent_widget) {
+Widget* BubbleDelegateView::CreateBubble(BubbleDelegateView* bubble_delegate) {
   bubble_delegate->Init();
+  Widget* parent_widget = bubble_delegate->anchor_view() ?
+      bubble_delegate->anchor_view()->GetWidget() : NULL;
   Widget* bubble_widget = CreateBubbleWidget(bubble_delegate, parent_widget);
 
 #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->SetContentsView(bubble_delegate->GetContentsView());
   bubble_widget->SetBounds(bubble_delegate->GetBubbleClientBounds());
 #else
   bubble_widget->SetBounds(bubble_delegate->GetBubbleBounds());
 #endif
 
   bubble_widget->AddObserver(bubble_delegate);
   if (parent_widget && parent_widget->GetTopLevelWidget())
     parent_widget->GetTopLevelWidget()->DisableInactiveRendering();
   return bubble_widget;
 }
@@ skipping 19 matching lines @@
 
 void BubbleDelegateView::OnWidgetActivationChanged(Widget* widget,
                                                    bool active) {
   if (close_on_deactivate() && widget == GetWidget() && !active) {
     GetWidget()->RemoveObserver(this);
     GetWidget()->Close();
   }
 }
 
 gfx::Point BubbleDelegateView::GetAnchorPoint() {
-  return anchor_point_;
+  if (!anchor_view())
+    return gfx::Point();
+
+  BubbleBorder::ArrowLocation location = GetArrowLocation();
+  gfx::Point anchor(anchor_view()->bounds().CenterPoint());
+  // By default, pick the middle of |anchor_view_|'s edge opposite the arrow.
+  if (BubbleBorder::is_arrow_on_horizontal(location)) {
+    anchor.SetPoint(anchor_view()->width() / 2,
+        BubbleBorder::is_arrow_on_top(location) ? anchor_view()->height() : 0);
+  } else if (BubbleBorder::has_arrow(location)) {
+    anchor.SetPoint(
+        BubbleBorder::is_arrow_on_left(location) ? anchor_view()->width() : 0,
+        anchor_view_->height() / 2);
+  }
+  View::ConvertPointToScreen(anchor_view(), &anchor);
+  return anchor;
 }
 
 BubbleBorder::ArrowLocation BubbleDelegateView::GetArrowLocation() const {
   return arrow_location_;
 }
 
 SkColor BubbleDelegateView::GetColor() const {
   return color_;
 }
 
@@ skipping 88 matching lines @@
 }
 
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(border_widget_->GetWindowScreenBounds().origin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views