Cleanup BubbleFrameView and BubbleBorder construction.

ui/views/bubble/bubble_frame_view.h

 // 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.
 
 #ifndef UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
 #define UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace views {
 
 class BubbleBorder;
 
-// This is a NonClientFrameView used to render the BubbleBorder.
+// The non-client frame view of bubble-styled widgets.
 class VIEWS_EXPORT BubbleFrameView : public NonClientFrameView {
  public:
-  // Sets the border to |border|, taking ownership. Important: do not call
-  // set_border() directly to change the border, use SetBubbleBorder() instead.
-  BubbleFrameView(const gfx::Insets& margins, BubbleBorder* border);
+
+  explicit BubbleFrameView(const gfx::Insets& content_margins);
   virtual ~BubbleFrameView();
 
   // NonClientFrameView overrides:
   virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
   virtual gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const OVERRIDE;
   virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
   virtual void GetWindowMask(const gfx::Size& size,
                              gfx::Path* window_mask) OVERRIDE {}
   virtual void ResetWindowControls() OVERRIDE {}
   virtual void UpdateWindowIcon() OVERRIDE {}
   virtual void UpdateWindowTitle() OVERRIDE {}
 
   // View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
+  // Use bubble_border() and SetBubbleBorder(), not border() and set_border().
   BubbleBorder* bubble_border() const { return bubble_border_; }
+  void SetBubbleBorder(BubbleBorder* border);
 
   gfx::Insets content_margins() const { return content_margins_; }
 
   // Given the size of the contents and the rect to point at, returns the bounds
   // of the bubble window. The bubble's arrow location may change if the bubble
   // does not fit on the monitor and |adjust_if_offscreen| is true.
   gfx::Rect GetUpdatedWindowBounds(const gfx::Rect& anchor_rect,
                                    gfx::Size client_size,
                                    bool adjust_if_offscreen);
 
-  void SetBubbleBorder(BubbleBorder* border);
-
  protected:
   // Returns the bounds for the monitor showing the specified |rect|.
   // This function is virtual to support testing environments.
   virtual gfx::Rect GetMonitorBounds(const gfx::Rect& rect);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewTest, GetBoundsForClientView);
 
   // Mirrors the bubble's arrow location on the |vertical| or horizontal axis,
   // if the generated window bounds don't fit in the monitor bounds.
@@ skipping 11 matching lines @@
 
   // Margins between the content and the inside of the border, in pixels.
   gfx::Insets content_margins_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleFrameView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_