Fix alignment of avatar bubbles in the NTP

ui/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 "ui/views/bubble/bubble_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 136 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() {
+gfx::Rect BubbleDelegateView::GetAnchorRect() {
   if (!anchor_view())
-    return gfx::Point();
+    return gfx::Rect();
 
   BubbleBorder::ArrowLocation location = GetArrowLocation();
-  gfx::Point anchor(anchor_view()->bounds().CenterPoint());
+  gfx::Point anchor;
   // 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);
+  } else {
+    anchor = anchor_view()->bounds().CenterPoint();
   }
   View::ConvertPointToScreen(anchor_view(), &anchor);
-  return anchor;
+  return gfx::Rect(anchor, gfx::Size());
 }
 
 BubbleBorder::ArrowLocation BubbleDelegateView::GetArrowLocation() const {
   return arrow_location_;
 }
 
 SkColor BubbleDelegateView::GetColor() const {
   return color_;
 }
 
@@ skipping 24 matching lines @@
   }
 }
 
 void BubbleDelegateView::ResetFade() {
   fade_animation_.reset();
   if (border_widget_)
     border_widget_->SetOpacity(original_opacity_);
   GetWidget()->SetOpacity(original_opacity_);
 }
 
+void BubbleDelegateView::SetAlignment(BubbleBorder::BubbleAlignment alignment) {
+  GetBubbleFrameView()->bubble_border()->set_alignment(
+      views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);

[msw, 2011/12/08 00:40:14]

Pass along alignment, not this hard-coded value.

[sail, 2011/12/08 01:41:10]

Done.

+  SizeToContents();
+}
+
 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;
 }
 
@@ skipping 41 matching lines @@
 }
 
 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()));
+  return GetBubbleFrameView()->GetWindowBoundsForAnchorAndClientSize(
+      GetAnchorRect(), GetPreferredSize());
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(border_widget_->GetWindowScreenBounds().origin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views