Adjust positioning of bookmarks bubble for Harmony.

ui/views/bubble/bubble_border.cc

 // Copyright (c) 2012 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 "ui/views/bubble/bubble_border.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
@@ skipping 170 matching lines @@
 BubbleBorder::~BubbleBorder() {}
 
 void BubbleBorder::set_paint_arrow(ArrowPaintType value) {
   if (UseMd())
     return;
   arrow_paint_type_ = value;
 }
 
 gfx::Rect BubbleBorder::GetBounds(const gfx::Rect& anchor_rect,
                                   const gfx::Size& contents_size) const {
+  if (UseMd()) {
+    // In MD, there are no arrows, so positioning logic is significantly
+    // simpler.
+    // TODO(estade): handle more anchor positions.
+    if (arrow_ == TOP_RIGHT) {
+      gfx::Rect contents_bounds(contents_size);
+      contents_bounds +=
+          anchor_rect.bottom_right() - contents_bounds.top_right();
+      contents_bounds.Inset(-GetInsets());
+      return contents_bounds;
+    }
+  }
+
   int x = anchor_rect.x();
   int y = anchor_rect.y();
   int w = anchor_rect.width();
   int h = anchor_rect.height();
   const gfx::Size size(GetSizeForContentsSize(contents_size));
   const int arrow_offset = GetArrowOffset(size);
   // |arrow_shift| is necessary to visually align the tip of the bubble arrow
   // with the anchor point. This shift is an inverse of the shadow thickness.
   int arrow_shift = UseMd() ? 0 :
       images_->arrow_interior_thickness + kStroke - images_->arrow_thickness;
@@ skipping 283 matching lines @@
 void BubbleBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
   if (border_->shadow() == BubbleBorder::NO_SHADOW_OPAQUE_BORDER)
     canvas->DrawColor(border_->background_color());
 
   // Fill the contents with a round-rect region to match the border images.
   SkPaint paint;
   paint.setAntiAlias(true);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(border_->background_color());
   SkPath path;
-  gfx::Rect bounds(view->GetLocalBounds());
-  bounds.Inset(border_->GetInsets());
+  gfx::RectF bounds(view->GetLocalBounds());
+  bounds.Inset(gfx::InsetsF(border_->GetInsets()));
+  if (UseMd()) {
+    // The border is 1px at all scale factors. Leave room for it.
+    const SkScalar one_pixel = SkFloatToScalar(1 / canvas->image_scale());
+    bounds.Inset(gfx::InsetsF(one_pixel));
+  }
 
   canvas->DrawRoundRect(bounds, border_->GetBorderCornerRadius(), paint);
 }
 
 }  // namespace views