Fix BubbleBorder wrong arrow for BOTTOM_LEFT and RIGHT_TOP.

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>  // for std::max
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 437 matching lines @@
     start_y += (is_horizontal ? 0 : before_arrow + arrow->height());
     canvas->TileImageInt(*edge, start_x, start_y,
         is_horizontal ? after_arrow : edge->width(),
         is_horizontal ? edge->height() : after_arrow);
   }
 }
 
 void BubbleBorder::DrawArrowInterior(gfx::Canvas* canvas,
                                      float tip_x,
                                      float tip_y) const {
-  const int offset_to_next_vertex =
-      (is_arrow_on_left(arrow_location_) || is_arrow_on_top(arrow_location_)) ?
+  const bool is_horizontal = is_arrow_on_horizontal(arrow_location_);
+  const bool positive_offset = is_horizontal ?
+      is_arrow_on_top(arrow_location_) : is_arrow_on_left(arrow_location_);
+  const int offset_to_next_vertex = positive_offset ?
       kArrowInteriorHeight : -kArrowInteriorHeight;
 
   SkPath path;
   path.incReserve(4);
   path.moveTo(SkDoubleToScalar(tip_x), SkDoubleToScalar(tip_y));
   path.lineTo(SkDoubleToScalar(tip_x + offset_to_next_vertex),
               SkDoubleToScalar(tip_y + offset_to_next_vertex));
-  if (is_arrow_on_horizontal(arrow_location_)) {
+  if (is_horizontal) {
     path.lineTo(SkDoubleToScalar(tip_x - offset_to_next_vertex),
                 SkDoubleToScalar(tip_y + offset_to_next_vertex));
   } else {
     path.lineTo(SkDoubleToScalar(tip_x + offset_to_next_vertex),
                 SkDoubleToScalar(tip_y - offset_to_next_vertex));
   }
   path.close();
 
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
@@ skipping 21 matching lines @@
   paint.setColor(border_->background_color());
   SkPath path;
   gfx::Rect bounds(view->GetContentsBounds());
   bounds.Inset(-border_->border_thickness(), -border_->border_thickness());
   SkScalar radius = SkIntToScalar(BubbleBorder::GetCornerRadius());
   path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
   canvas->DrawPath(path, paint);
 }
 
 }  // namespace views