Merge 108537 - Align avatar bubble with edge of anchor control

chrome/browser/ui/views/bubble/border_contents.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/bubble/border_contents.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/browser/ui/window_sizer.h"
@@ skipping 20 matching lines @@
 
   bubble_border_ = new views::BubbleBorder(arrow_location);
   set_border(bubble_border_);
   set_background(new views::BubbleBackground(bubble_border_));
 }
 
 void BorderContents::SetBackgroundColor(SkColor color) {
   bubble_border_->set_background_color(color);
 }
 
+void BorderContents::SetAlignment(
+    views::BubbleBorder::BubbleAlignment alignment) {
+  bubble_border_->set_alignment(alignment);
+}
+
 void BorderContents::SizeAndGetBounds(
     const gfx::Rect& position_relative_to,
     views::BubbleBorder::ArrowLocation arrow_location,
     bool allow_bubble_offscreen,
     const gfx::Size& contents_size,
     gfx::Rect* contents_bounds,
     gfx::Rect* window_bounds) {
   if (base::i18n::IsRTL())
     arrow_location = views::BubbleBorder::horizontal_mirror(arrow_location);
   bubble_border_->set_arrow_location(arrow_location);
@@ skipping 100 matching lines @@
   int right = std::max(0, window_bounds.right() - monitor_bounds.right());
 
   offscreen_insets->Set(top, left, bottom, right);
   return true;
 }
 
 // static
 int BorderContents::GetInsetsLength(const gfx::Insets& insets, bool vertical) {
   return vertical ? insets.height() : insets.width();
 }