Merge 108537 - Align avatar bubble with edge of anchor control

chrome/browser/ui/views/frame/browser_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/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 2585 matching lines @@
   BrowserView* view = new BrowserView(browser);
   (new BrowserFrame(view))->InitBrowserFrame();
   view->GetWidget()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   return view;
 }
 #endif
 
 void BrowserView::ShowAvatarBubble(TabContents* tab_contents,
                                    const gfx::Rect& rect) {
-  gfx::Point origin(rect.right(), rect.bottom());
+  gfx::Point origin(rect.origin());
   views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin);
-  gfx::Rect bounds;
-  bounds.set_origin(origin);
+  gfx::Rect bounds(origin, rect.size());
 
   AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_.get());
   // Bubble::Show() takes ownership of the view.
-  Bubble::Show(this->GetWidget(), bounds,
-               views::BubbleBorder::TOP_RIGHT,
+  Bubble::Show(this->GetWidget(), bounds, views::BubbleBorder::TOP_RIGHT,
+               views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE,
                bubble_view, bubble_view);
 }
 
 void BrowserView::ShowAvatarBubbleFromAvatarButton() {
   AvatarMenuButton* button = frame_->GetAvatarMenuButton();
   if (button)
     button->ShowAvatarBubble();
 }