Merge 108537 - Align avatar bubble with edge of anchor control

views/bubble/bubble_border.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 "views/bubble/bubble_border.h"
 
 #include <algorithm>  // for std::max
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 42 matching lines @@
   int y = position_relative_to.y();
   int w = position_relative_to.width();
   int h = position_relative_to.height();
   int arrow_offset = override_arrow_offset_ ? override_arrow_offset_ :
                                               arrow_offset_;
 
   // Calculate bubble x coordinate.
   switch (arrow_location_) {
     case TOP_LEFT:
     case BOTTOM_LEFT:
-      x += w / 2 - arrow_offset;
+      x += alignment_ == ALIGN_ARROW_TO_MID_ANCHOR ? w / 2 - arrow_offset :
+           -kArrowOverlap;
       break;
 
     case TOP_RIGHT:
     case BOTTOM_RIGHT:
-      x += w / 2 + arrow_offset - border_size.width() + 1;
+      x += alignment_ == ALIGN_ARROW_TO_MID_ANCHOR ?
+          w / 2 + arrow_offset - border_size.width() + 1 :
+          w - border_size.width() + kArrowOverlap;
       break;
 
     case LEFT_TOP:
     case LEFT_BOTTOM:
       x += w - kArrowOverlap;
       break;
 
     case RIGHT_TOP:
     case RIGHT_BOTTOM:
       x += kArrowOverlap - border_size.width();
@@ skipping 12 matching lines @@
       y += h - kArrowOverlap;
       break;
 
     case BOTTOM_LEFT:
     case BOTTOM_RIGHT:
       y += kArrowOverlap - border_size.height();
       break;
 
     case LEFT_TOP:
     case RIGHT_TOP:
-      y += h / 2 - arrow_offset;
+      y += alignment_ == ALIGN_ARROW_TO_MID_ANCHOR ? h / 2 - arrow_offset :
+           -kArrowOverlap;
       break;
 
     case LEFT_BOTTOM:
     case RIGHT_BOTTOM:
-      y += h / 2 + arrow_offset - border_size.height() + 1;
+      y += alignment_ == ALIGN_ARROW_TO_MID_ANCHOR ?
+          h / 2 + arrow_offset - border_size.height() + 1 :
+          h - border_size.height() + kArrowOverlap;
       break;
 
     case NONE:
       y += h;
       break;
 
     case FLOAT:
       y += h / 2 - border_size.height() / 2;
       break;
   }
@@ skipping 324 matching lines @@
   gfx::Rect bounds(view->GetContentsBounds());
   SkRect rect;
   rect.set(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.y()),
            SkIntToScalar(bounds.right()), SkIntToScalar(bounds.bottom()));
   SkScalar radius = SkIntToScalar(BubbleBorder::GetCornerRadius());
   path.addRoundRect(rect, radius, radius);
   canvas->GetSkCanvas()->drawPath(path, paint);
 }
 
 }  // namespace views