Make BubbleWindow a Widget override with a BubbleFrameView.

chrome/browser/chromeos/frame/bubble_frame_view.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 "chrome/browser/chromeos/frame/bubble_frame_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/frame/bubble_window.h"
@@ skipping 24 matching lines @@
 #if defined(CROS_FONTS_USING_BCI)
 const int kTitleFontSizeDelta = 0;
 #else
 const int kTitleFontSizeDelta = 1;
 #endif
 
 }  // namespace
 
 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) {
   if (widget_delegate->ShouldShowWindowTitle()) {
     title_ = new views::Label(widget_delegate->GetWindowTitle());
     title_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     title_->SetFont(title_->font().DeriveFont(kFontSizeCorrectionDelta,
                                               gfx::Font::BOLD));
     AddChildView(title_);
   }
@@ skipping 23 matching lines @@
   DCHECK(throbber_ != NULL);
   if (title_)
     title_->SetText(string16());
   throbber_->Start();
 }
 
 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 {
   return client_view_bounds_;
 }
 
 gfx::Rect BubbleFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   gfx::Insets insets = GetInsets();
 
@@ skipping 38 matching lines @@
 gfx::Insets BubbleFrameView::GetInsets() const {
   return (style_ & STYLE_FLUSH || style_ & STYLE_FLUSH_CONTENT) ?
          gfx::Insets() :
          gfx::Insets(kTitleTopPadding,
                      kHorizontalPadding,
                      0,
                      kHorizontalPadding);
 }
 
 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();
 }
 
 void BubbleFrameView::Layout() {
   gfx::Insets insets = GetInsets();
 
   gfx::Size title_size;
   if (title_)
     title_size = title_->GetPreferredSize();
   gfx::Size close_button_size;
@@ skipping 67 matching lines @@
   SkRect rect;
   rect.set(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.y()),
            SkIntToScalar(bounds.right()), SkIntToScalar(bounds.bottom()));
   path.addRect(rect);
   canvas->GetSkCanvas()->drawPath(path, paint);
 }
 
 void BubbleFrameView::ButtonPressed(views::Button* sender,
                                     const views::Event& event) {
   if (close_button_ != NULL && sender == close_button_)
-    frame_->Close();
+    GetWidget()->Close();
 }
 
 }  // namespace chromeos