Merge 108537 - Align avatar bubble with edge of anchor control

views/bubble/bubble_border.h

 // 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.
 
 #ifndef VIEWS_BUBBLE_BUBBLE_BORDER_H_
 #define VIEWS_BUBBLE_BUBBLE_BORDER_H_
 #pragma once
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "views/background.h"
@@ skipping 17 matching lines @@
     BOTTOM_LEFT  = 2,
     BOTTOM_RIGHT = 3,
     LEFT_TOP     = 4,
     RIGHT_TOP    = 5,
     LEFT_BOTTOM  = 6,
     RIGHT_BOTTOM = 7,
     NONE  = 8,  // No arrow. Positioned under the supplied rect.
     FLOAT = 9   // No arrow. Centered over the supplied rect.
   };
 
+  // The position of the bubble in relation to the anchor.
+  enum BubbleAlignment {
+    // The tip of the arrow points to the middle of the anchor.
+    ALIGN_ARROW_TO_MID_ANCHOR,
+    // The edge nearest to the arrow is lined up with the edge of the anchor.
+    ALIGN_EDGE_TO_ANCHOR_EDGE
+  };
+
   explicit BubbleBorder(ArrowLocation arrow_location)
       : override_arrow_offset_(0),
         arrow_location_(arrow_location),
+        alignment_(ALIGN_ARROW_TO_MID_ANCHOR),
         background_color_(SK_ColorWHITE) {
     InitClass();
   }
 
   // Returns the radius of the corner of the border.
   static int GetCornerRadius() {
     // We can't safely calculate a border radius by comparing the sizes of the
     // side and corner images, because either may have been extended in various
     // directions in order to do more subtle dropshadow fading or other effects.
     // So we hardcode the most accurate value.
     return 4;
   }
 
   // Sets the location for the arrow.
   void set_arrow_location(ArrowLocation arrow_location) {
     arrow_location_ = arrow_location;
   }
   ArrowLocation arrow_location() const { return arrow_location_; }
 
+  // Sets the alignment.
+  void set_alignment(BubbleAlignment alignment) { alignment_ = alignment; }
+  BubbleAlignment alignment() const { return alignment_; }
+
   static ArrowLocation horizontal_mirror(ArrowLocation loc) {
     return loc >= NONE ? loc : static_cast<ArrowLocation>(loc ^ 1);
   }
 
   static ArrowLocation vertical_mirror(ArrowLocation loc) {
     return loc >= NONE ? loc : static_cast<ArrowLocation>(loc ^ 2);
   }
 
   static bool has_arrow(ArrowLocation loc) {
     return loc >= NONE ? false : true;
@@ skipping 74 matching lines @@
   static SkBitmap* right_arrow_;
   static SkBitmap* bottom_arrow_;
 
   // Minimal offset of the arrow from the closet edge of bounding rect.
   static int arrow_offset_;
 
   // If specified, overrides the pre-calculated |arrow_offset_| of the arrow.
   int override_arrow_offset_;
 
   ArrowLocation arrow_location_;
+  BubbleAlignment alignment_;
   SkColor background_color_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleBorder);
 };
 
 // A Background that clips itself to the specified BubbleBorder and uses
 // the background color of the BubbleBorder.
 class VIEWS_EXPORT BubbleBackground : public views::Background {
  public:
   explicit BubbleBackground(BubbleBorder* border) : border_(border) {}
 
   // Background overrides.
   virtual void Paint(gfx::Canvas* canvas, views::View* view) const;
 
  private:
   BubbleBorder* border_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleBackground);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_BUBBLE_BUBBLE_BORDER_H_