Views Bubble API adjustments and cleanup

views/bubble/bubble_frame_view.h

Index: views/bubble/bubble_frame_view.h
diff --git a/views/bubble/bubble_frame_view.h b/views/bubble/bubble_frame_view.h
index c6ec085b149ca7b01d0a358de7ca650dc1014ae5..d7ccd9f1f6a4aa530d846e8764756b55acae5007 100644
--- a/views/bubble/bubble_frame_view.h
+++ b/views/bubble/bubble_frame_view.h
@@ -7,17 +7,7 @@
 #pragma once
 
 #include "views/bubble/bubble_border.h"
-#include "views/widget/widget.h"
-#include "views/window/client_view.h"
-#include "views/window/window_resources.h"
-
-namespace gfx {
-class Canvas;
-class Font;
-class Size;
-class Path;
-class Point;
-}
+#include "views/window/non_client_view.h"
 
 namespace views {
 
@@ -26,10 +16,9 @@ namespace views {
 ////////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT BubbleFrameView : public NonClientFrameView {
  public:
-  BubbleFrameView(Widget* frame,
-                  const gfx::Rect& bounds,
-                  SkColor color,
-                  BubbleBorder::ArrowLocation location);
+  BubbleFrameView(BubbleBorder::ArrowLocation location,
+                  const gfx::Size& client_size,
+                  SkColor color);
   virtual ~BubbleFrameView();
 
   // NonClientFrameView overrides:
@@ -37,26 +26,17 @@ class VIEWS_EXPORT BubbleFrameView : public NonClientFrameView {
   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 EnableClose(bool enable) OVERRIDE;
-  virtual void ResetWindowControls() OVERRIDE;
-  virtual void UpdateWindowIcon() OVERRIDE;
+  virtual void GetWindowMask(const gfx::Size& size,
+                             gfx::Path* window_mask) OVERRIDE {}
+  virtual void EnableClose(bool enable) OVERRIDE {}
+  virtual void ResetWindowControls() OVERRIDE {}
+  virtual void UpdateWindowIcon() OVERRIDE {}
 
   // View overrides:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  private:
-  // Not owned.
-  Widget* frame_;
-  // Window bounds in screen coordinates.
-  gfx::Rect frame_bounds_;
-  // The bubble border object owned by this view.
-  BubbleBorder* bubble_border_;
-  // The bubble background object owned by this view.
-  BubbleBackground* bubble_background_;
-
   DISALLOW_COPY_AND_ASSIGN(BubbleFrameView);
 };