Consolidate bubble border code.

ui/views/bubble/bubble_delegate.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_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 93 matching lines @@
 const SkColor BubbleDelegateView::kBackgroundColor = SK_ColorWHITE;
 #endif
 
 BubbleDelegateView::BubbleDelegateView()
     : close_on_esc_(true),
       close_on_deactivate_(true),
       anchor_view_(NULL),
       anchor_widget_(NULL),
       move_with_anchor_(false),
       arrow_location_(BubbleBorder::TOP_LEFT),
+      border_shadow_(BubbleBorder::NO_SHADOW),
       color_(kBackgroundColor),
       margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
       original_opacity_(255),
       border_widget_(NULL),
       use_focusless_(false),
       accept_events_(true),
-      try_mirroring_arrow_(true),
+      try_fit_bubble_(true),
       parent_window_(NULL) {
   set_background(Background::CreateSolidBackground(color_));
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
 BubbleDelegateView::BubbleDelegateView(
     View* anchor_view,
     BubbleBorder::ArrowLocation arrow_location)
     : close_on_esc_(true),
       close_on_deactivate_(true),
       anchor_view_(anchor_view),
       anchor_widget_(NULL),
       move_with_anchor_(false),
       arrow_location_(arrow_location),
+      border_shadow_(BubbleBorder::NO_SHADOW),
       color_(kBackgroundColor),
       margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
       original_opacity_(255),
       border_widget_(NULL),
       use_focusless_(false),
       accept_events_(true),
-      try_mirroring_arrow_(true),
+      try_fit_bubble_(true),
       parent_window_(NULL) {
   set_background(Background::CreateSolidBackground(color_));
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
 BubbleDelegateView::~BubbleDelegateView() {
   if (anchor_widget() != NULL)
     anchor_widget()->RemoveObserver(this);
   anchor_widget_ = NULL;
   anchor_view_ = NULL;
@@ skipping 35 matching lines @@
 
 View* BubbleDelegateView::GetContentsView() {
   return this;
 }
 
 NonClientFrameView* BubbleDelegateView::CreateNonClientFrameView(
     Widget* widget) {
   BubbleBorder::ArrowLocation arrow_loc = arrow_location();
   if (base::i18n::IsRTL())
     arrow_loc = BubbleBorder::horizontal_mirror(arrow_loc);
-  // TODO(alicet): Expose the shadow option in BorderContentsView when we make
-  // the fullscreen exit bubble use the new bubble code.
-  BubbleBorder* border = new BubbleBorder(arrow_loc, BubbleBorder::NO_SHADOW);
+  BubbleBorder* border = new BubbleBorder(arrow_loc, border_shadow_);
   border->set_background_color(color());
   BubbleFrameView* frame_view = new BubbleFrameView(margins(), border);
   frame_view->set_background(new BubbleBackground(border));
   return frame_view;
 }
 
 void BubbleDelegateView::OnWidgetClosing(Widget* widget) {
   if (anchor_widget() == widget) {
     anchor_view_ = NULL;
     anchor_widget_ = NULL;
@@ skipping 133 matching lines @@
 BubbleFrameView* BubbleDelegateView::GetBubbleFrameView() const {
   const Widget* widget = border_widget_ ? border_widget_ : GetWidget();
   const NonClientView* view = widget ? widget->non_client_view() : NULL;
   return view ? static_cast<BubbleFrameView*>(view->frame_view()) : NULL;
 }
 
 gfx::Rect BubbleDelegateView::GetBubbleBounds() {
   // The argument rect has its origin at the bubble's arrow anchor point;
   // its size is the preferred size of the bubble's client view (this view).
   return GetBubbleFrameView()->GetUpdatedWindowBounds(GetAnchorRect(),
-      GetPreferredSize(), try_mirroring_arrow_);
+      GetPreferredSize(), try_fit_bubble_);
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(border_widget_->GetWindowBoundsInScreen().origin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views