Cleanup BubbleFrameView and BubbleBorder construction.

ui/views/bubble/bubble_frame_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/bubble_frame_view.h"
 
 #include <algorithm>
 
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_border.h"
@@ skipping 21 matching lines @@
     return std::max(0, monitor_bounds.y() - window_bounds.y()) +
            std::max(0, window_bounds.bottom() - monitor_bounds.bottom());
   return std::max(0, monitor_bounds.x() - window_bounds.x()) +
          std::max(0, window_bounds.right() - monitor_bounds.right());
 }
 
 }  // namespace
 
 namespace views {
 
-BubbleFrameView::BubbleFrameView(const gfx::Insets& margins,
-                                 BubbleBorder* border)
-    : bubble_border_(border),
-      content_margins_(margins) {
-  set_border(bubble_border_);
+BubbleFrameView::BubbleFrameView(const gfx::Insets& content_margins)
+    : bubble_border_(NULL),
+      content_margins_(content_margins) {
 }
 
 BubbleFrameView::~BubbleFrameView() {}
 
 gfx::Rect BubbleFrameView::GetBoundsForClientView() const {
   gfx::Rect client_bounds = GetLocalBounds();
   client_bounds.Inset(border()->GetInsets());
   client_bounds.Inset(content_margins());
   return client_bounds;
 }
 
 gfx::Rect BubbleFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   return const_cast<BubbleFrameView*>(this)->GetUpdatedWindowBounds(
       gfx::Rect(), client_bounds.size(), false);
 }
 
 int BubbleFrameView::NonClientHitTest(const gfx::Point& point) {
   return GetWidget()->client_view()->NonClientHitTest(point);
 }
 
 gfx::Size BubbleFrameView::GetPreferredSize() {
   gfx::Size client_size(GetWidget()->client_view()->GetPreferredSize());
   return GetUpdatedWindowBounds(gfx::Rect(), client_size, false).size();
 }
 
+void BubbleFrameView::SetBubbleBorder(BubbleBorder* border) {
+  bubble_border_ = border;
+  set_border(bubble_border_);
+
+  // Update the background, which relies on the border.
+  set_background(new views::BubbleBackground(border));
+}
+
 gfx::Rect BubbleFrameView::GetUpdatedWindowBounds(const gfx::Rect& anchor_rect,
                                                   gfx::Size client_size,
                                                   bool adjust_if_offscreen) {
   // Give the contents a margin.
   client_size.Enlarge(content_margins_.width(), content_margins_.height());
 
   const BubbleBorder::ArrowLocation arrow = bubble_border_->arrow_location();
   if (adjust_if_offscreen && BubbleBorder::has_arrow(arrow)) {
     if (!bubble_border_->is_arrow_at_center(arrow)) {
       // Try to mirror the anchoring if the bubble does not fit on the screen.
       MirrorArrowIfOffScreen(true, anchor_rect, client_size);
       MirrorArrowIfOffScreen(false, anchor_rect, client_size);
     } else {
       OffsetArrowIfOffScreen(anchor_rect, client_size);
     }
   }
 
   // Calculate the bounds with the arrow in its updated location and offset.
   return bubble_border_->GetBounds(anchor_rect, client_size);
 }
 
-void BubbleFrameView::SetBubbleBorder(BubbleBorder* border) {
-  bubble_border_ = border;
-  set_border(bubble_border_);
-
-  // Update the background, which relies on the border.
-  set_background(new views::BubbleBackground(border));
-}
-
 gfx::Rect BubbleFrameView::GetMonitorBounds(const gfx::Rect& rect) {
   // TODO(scottmg): Native is wrong. http://crbug.com/133312
   return gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint(
       rect.CenterPoint()).work_area();
 }
 
 void BubbleFrameView::MirrorArrowIfOffScreen(
     bool vertical,
     const gfx::Rect& anchor_rect,
     const gfx::Size& client_size) {
@@ skipping 49 matching lines @@
   // |offscreen_adjust|, e.g. positive |offscreen_adjust| means bubble
   // window needs to be moved to the right and that means we need to move arrow
   // to the left, and that means negative offset.
   bubble_border_->set_arrow_offset(
       bubble_border_->GetArrowOffset(window_bounds.size()) - offscreen_adjust);
   if (offscreen_adjust)
     SchedulePaint();
 }
 
 }  // namespace views