Merge 108537 - Align avatar bubble with edge of anchor control

views/bubble/bubble_border.cc

Index: views/bubble/bubble_border.cc
===================================================================
--- views/bubble/bubble_border.cc	(revision 108874)
+++ views/bubble/bubble_border.cc	(working copy)
@@ -60,12 +60,15 @@
   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:
@@ -98,12 +101,15 @@
 
     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: