More flexibility in BubbleBorder arrow rendering.

ui/views/bubble/tray_bubble_view.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/tray_bubble_view.h"
 
 #include <algorithm>
 
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 32 matching lines @@
  public:
   TrayBubbleBorder(View* owner,
                    View* anchor,
                    TrayBubbleView::InitParams params)
       : BubbleBorder(params.arrow_location, params.shadow, params.arrow_color),
         owner_(owner),
         anchor_(anchor),
         tray_arrow_offset_(params.arrow_offset) {
     set_alignment(params.arrow_alignment);
     set_background_color(params.arrow_color);
-    set_paint_arrow(!params.hide_arrow);
+    set_paint_arrow(params.arrow_paint_type);
   }
 
   virtual ~TrayBubbleBorder() {}
 
   // Overridden from BubbleBorder.
   // Sets the bubble on top of the anchor when it has no arrow.
   virtual gfx::Rect GetBounds(const gfx::Rect& position_relative_to,
                               const gfx::Size& contents_size) const OVERRIDE {
     if (has_arrow(arrow_location()))
       return BubbleBorder::GetBounds(position_relative_to, contents_size);
@@ skipping 156 matching lines @@
     : anchor_type(anchor_type),
       anchor_alignment(anchor_alignment),
       min_width(min_width),
       max_width(max_width),
       max_height(0),
       can_activate(false),
       close_on_deactivate(true),
       arrow_color(SK_ColorBLACK),
       arrow_location(BubbleBorder::NONE),
       arrow_offset(kArrowDefaultOffset),
-      hide_arrow(false),
+      arrow_paint_type(BubbleBorder::PAINT_NORMAL),
       shadow(BubbleBorder::BIG_SHADOW),
       arrow_alignment(BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE) {
 }
 
 // static
 TrayBubbleView* TrayBubbleView::Create(gfx::NativeView parent_window,
                                        View* anchor,
                                        Delegate* delegate,
                                        InitParams* init_params) {
   // Set arrow_location here so that it can be passed correctly to the
@@ skipping 73 matching lines @@
 
 void TrayBubbleView::SetWidth(int width) {
   width = std::max(std::min(width, params_.max_width), params_.min_width);
   if (preferred_width_ == width)
     return;
   preferred_width_ = width;
   if (GetWidget())
     SizeToContents();
 }
 
-void TrayBubbleView::SetPaintArrow(bool paint_arrow) {
-  bubble_border_->set_paint_arrow(paint_arrow && !params_.hide_arrow);
+void TrayBubbleView::SetArrowPaintType(
+    views::BubbleBorder::ArrowPaintType paint_type) {
+  bubble_border_->set_paint_arrow(paint_type);
 }
 
 gfx::Insets TrayBubbleView::GetBorderInsets() const {
   return bubble_border_->GetInsets();
 }
 
 void TrayBubbleView::Init() {
   BoxLayout* layout = new BottomAlignedBoxLayout(this);
   layout->set_spread_blank_space(true);
   SetLayoutManager(layout);
@@ skipping 65 matching lines @@
                                           View* parent,
                                           View* child) {
   if (get_use_acceleration_when_possible() && is_add && child == this) {
     parent->SetPaintToLayer(true);
     parent->SetFillsBoundsOpaquely(true);
     parent->layer()->SetMasksToBounds(true);
   }
 }
 
 }  // namespace views