Merge 108537 - Align avatar bubble with edge of anchor control

chrome/browser/ui/views/web_intent_picker_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 <algorithm>
 #include <vector>
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
@@ skipping 149 matching lines @@
     point = gfx::Point(width - kIconHorizontalOffset, 0);
   }
   point.Offset(0, kIconVerticalOffset);
   views::View::ConvertPointToScreen(browser_view->toolbar()->location_bar(),
                                     &point);
   gfx::Rect bounds = browser_view->toolbar()->location_bar()->bounds();
   bounds.set_origin(point);
   bounds.set_width(kIconHorizontalOffset);
 
   bubble_ = Bubble::Show(browser_view->GetWidget(), bounds,
-                         views::BubbleBorder::TOP_LEFT, this, this);
+                         views::BubbleBorder::TOP_LEFT,
+                         views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR,
+                         this, this);
 }
 
 WebIntentPickerView::~WebIntentPickerView() {
 }
 
 void WebIntentPickerView::ButtonPressed(views::Button* sender,
                                         const views::Event& event) {
   // TODO(binji) When we support the plus button, pressing it should forward the
   // user to services in the Chrome Web Store that provide this intent.
   if (sender == plus_button_)
@@ skipping 93 matching lines @@
   views::Label* bottom_label = new views::Label(
       l10n_util::GetStringUTF16(IDS_FIND_MORE_INTENT_HANDLER_MESSAGE));
   bottom_label->SetMultiLine(true);
   bottom_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   bottom_label->SetFont(
       bottom_label->font().DeriveFont(kWebStoreLabelFontDelta));
   main_content->AddChildView(bottom_label);
 
   AddChildView(main_content);
 }