Merge 108537 - Align avatar bubble with edge of anchor control

chrome/browser/chromeos/login/message_bubble.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/chromeos/login/message_bubble.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 132 matching lines @@
     views::BubbleBorder::ArrowLocation arrow_location,
     SkBitmap* image,
     const std::wstring& text,
     const std::vector<std::wstring>& links,
     MessageBubbleDelegate* delegate) {
   // The bubble will be destroyed when it is closed.
   MessageBubble* bubble = new MessageBubble(
       views::Widget::InitParams::TYPE_POPUP, parent, image, text, links,
       true, delegate);
   bubble->InitBubble(parent, position_relative_to, arrow_location,
+                     views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR,
                      bubble->text_->parent(), delegate);
   return bubble;
 }
 
 // static
 MessageBubble* MessageBubble::ShowNoGrab(
     views::Widget* parent,
     const gfx::Rect& position_relative_to,
     views::BubbleBorder::ArrowLocation arrow_location,
     SkBitmap* image,
     const std::wstring& text,
     const std::wstring& help,
     MessageBubbleDelegate* delegate) {
   std::vector<std::wstring> links;
   if (!help.empty())
     links.push_back(help);
   // The bubble will be destroyed when it is closed.
   MessageBubble* bubble = new MessageBubble(
       views::Widget::InitParams::TYPE_CONTROL, parent, image, text, links,
       false, delegate);
   bubble->InitBubble(parent, position_relative_to, arrow_location,
+                     views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR,
                      bubble->text_->parent(), delegate);
   return bubble;
 }
 
 #if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK)
 // TODO(saintlou): Unclear if we need this for the !gtk case.
 void MessageBubble::OnActiveChanged() {
   if (parent_ && IsActive()) {
     // Show the parent.
     gtk_window_present_with_time(parent_->GetNativeWindow(),
@@ skipping 15 matching lines @@
 #if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK)
 gboolean MessageBubble::OnButtonPress(GtkWidget* widget,
                                       GdkEventButton* event) {
   NativeWidgetGtk::OnButtonPress(widget, event);
   // Never propagate event to parent.
   return true;
 }
 #endif
 
 }  // namespace chromeos