Make BubbleWindow a Widget override with a BubbleFrameView.

chrome/browser/chromeos/frame/bubble_frame_view.cc

Index: chrome/browser/chromeos/frame/bubble_frame_view.cc
diff --git a/chrome/browser/chromeos/frame/bubble_frame_view.cc b/chrome/browser/chromeos/frame/bubble_frame_view.cc
index 9aaad387c24a941731ec8c7bab7843f29970d689..55607a680b28c061fbce6b6ab40860fda070138f 100644
--- a/chrome/browser/chromeos/frame/bubble_frame_view.cc
+++ b/chrome/browser/chromeos/frame/bubble_frame_view.cc
@@ -42,11 +42,9 @@ const int kTitleFontSizeDelta = 1;
 
 namespace chromeos {
 
-BubbleFrameView::BubbleFrameView(views::Widget* frame,
-                                 views::WidgetDelegate* widget_delegate,
+BubbleFrameView::BubbleFrameView(views::WidgetDelegate* widget_delegate,
                                  DialogStyle style)
-    : frame_(frame),
-      style_(style),
+    : style_(style),
       title_(NULL),
       close_button_(NULL),
       throbber_(NULL) {
@@ -90,7 +88,7 @@ void BubbleFrameView::StopThrobber() {
   DCHECK(throbber_ != NULL);
   throbber_->Stop();
   if (title_)
-    title_->SetText(frame_->widget_delegate()->GetWindowTitle());
+    title_->SetText(GetWidget()->widget_delegate()->GetWindowTitle());
 }
 
 gfx::Rect BubbleFrameView::GetBoundsForClientView() const {
@@ -149,9 +147,9 @@ gfx::Insets BubbleFrameView::GetInsets() const {
 }
 
 gfx::Size BubbleFrameView::GetPreferredSize() {
-  gfx::Size pref = frame_->client_view()->GetPreferredSize();
+  gfx::Size pref = GetWidget()->client_view()->GetPreferredSize();
   gfx::Rect bounds(0, 0, pref.width(), pref.height());
-  return frame_->non_client_view()->GetWindowBoundsForClientBounds(
+  return GetWidget()->non_client_view()->GetWindowBoundsForClientBounds(
       bounds).size();
 }
 
@@ -239,7 +237,7 @@ void BubbleFrameView::OnPaint(gfx::Canvas* canvas) {
 void BubbleFrameView::ButtonPressed(views::Button* sender,
                                     const views::Event& event) {
   if (close_button_ != NULL && sender == close_button_)
-    frame_->Close();
+    GetWidget()->Close();
 }
 
 }  // namespace chromeos