Merge BorderContentsView into BubbleFrameView; simplify.

ui/views/bubble/bubble_delegate.cc

 // 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.
 
 #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 65 matching lines @@
 const SkColor BubbleDelegateView::kBackgroundColor =
     color_utils::GetSysSkColor(COLOR_WINDOW);
 #else
 // TODO(beng): source from theme provider.
 const SkColor BubbleDelegateView::kBackgroundColor = SK_ColorWHITE;
 #endif
 
 BubbleDelegateView::BubbleDelegateView()
     : close_on_esc_(true),
       close_on_deactivate_(true),
-      allow_bubble_offscreen_(false),
       anchor_view_(NULL),
       arrow_location_(BubbleBorder::TOP_LEFT),
       color_(kBackgroundColor),
       original_opacity_(255),
       border_widget_(NULL),
       use_focusless_(false) {
   set_background(views::Background::CreateSolidBackground(color_));
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, 0));
 }
 
 BubbleDelegateView::BubbleDelegateView(
     View* anchor_view,
     BubbleBorder::ArrowLocation arrow_location)
     : close_on_esc_(true),
       close_on_deactivate_(true),
-      allow_bubble_offscreen_(false),
       anchor_view_(anchor_view),
       arrow_location_(arrow_location),
       color_(kBackgroundColor),
       original_opacity_(255),
       border_widget_(NULL),
       use_focusless_(false) {
   set_background(views::Background::CreateSolidBackground(color_));
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, 0));
 }
 
@@ skipping 26 matching lines @@
 
 BubbleDelegateView* BubbleDelegateView::AsBubbleDelegate() {
   return this;
 }
 
 View* BubbleDelegateView::GetContentsView() {
   return this;
 }
 
 NonClientFrameView* BubbleDelegateView::CreateNonClientFrameView() {
-  return new BubbleFrameView(GetArrowLocation(),
-                             GetPreferredSize(),
-                             color(),
-                             allow_bubble_offscreen());
+  return new BubbleFrameView(arrow_location(), color());
 }
 
 void BubbleDelegateView::OnWidgetActivationChanged(Widget* widget,
                                                    bool active) {
   if (close_on_deactivate() && widget == GetWidget() && !active) {
     GetWidget()->RemoveObserver(this);
     GetWidget()->Close();
   }
 }
 
 gfx::Rect BubbleDelegateView::GetAnchorRect() {
-  if (!anchor_view())
-    return gfx::Rect();
-
-  BubbleBorder::ArrowLocation location = GetArrowLocation();
-  gfx::Point anchor;
-  // By default, pick the middle of |anchor_view_|'s edge opposite the arrow.
-  if (BubbleBorder::is_arrow_on_horizontal(location)) {
-    anchor.SetPoint(anchor_view()->width() / 2,
-        BubbleBorder::is_arrow_on_top(location) ? anchor_view()->height() : 0);
-  } else if (BubbleBorder::has_arrow(location)) {
-    anchor.SetPoint(
-        BubbleBorder::is_arrow_on_left(location) ? anchor_view()->width() : 0,
-        anchor_view_->height() / 2);
-  } else {
-    anchor = anchor_view()->bounds().CenterPoint();
-  }
-  View::ConvertPointToScreen(anchor_view(), &anchor);
-  return gfx::Rect(anchor, gfx::Size());
-}
-
-BubbleBorder::ArrowLocation BubbleDelegateView::GetArrowLocation() const {
-  return arrow_location_;
+  return anchor_view() ? anchor_view()->GetScreenBounds() : gfx::Rect();
 }
 
 void BubbleDelegateView::Show() {
   if (border_widget_)
     border_widget_->Show();
   GetWidget()->Show();
   GetFocusManager()->SetFocusedView(GetInitiallyFocusedView());
   if (anchor_view() && anchor_view()->GetWidget() &&
       anchor_view()->GetWidget()->GetTopLevelWidget())
     anchor_view()->GetWidget()->GetTopLevelWidget()->DisableInactiveRendering();
@@ skipping 83 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()->GetWindowBoundsForAnchorAndClientSize(
-      GetAnchorRect(), GetPreferredSize());
+  return GetBubbleFrameView()->GetUpdatedWindowBounds(GetAnchorRect(),
+      GetPreferredSize(), true /*try_mirroring_arrow*/);
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(border_widget_->GetWindowScreenBounds().origin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views