Make BubbleWindow a Widget override with a BubbleFrameView.

chrome/browser/chromeos/frame/bubble_window.h

Index: chrome/browser/chromeos/frame/bubble_window.h
diff --git a/chrome/browser/chromeos/frame/bubble_window.h b/chrome/browser/chromeos/frame/bubble_window.h
index 0405ebf2eef831983d18b00c1900cde0cbb0fca5..d36193af8a129294572f01041a5087c51175b60d 100644
--- a/chrome/browser/chromeos/frame/bubble_window.h
+++ b/chrome/browser/chromeos/frame/bubble_window.h
@@ -6,42 +6,26 @@
 #define CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_WINDOW_H_
 #pragma once
 
-#include "chrome/browser/chromeos/frame/bubble_window_style.h"
 #include "chrome/browser/ui/dialog_style.h"
+#include "ui/views/widget/widget.h"
 
-#if defined(TOOLKIT_USES_GTK)
-// TODO(msw): While I dislike the includes and code to be mixed into the same
-// preprocessor conditional, this seems okay as I can hopefully fix this up
-// in a matter of days / crbug.com/98322.
-#include "ui/views/widget/native_widget_gtk.h"
-#else // TOOLKIT_USES_GTK
-#include "ui/views/view.h"
-#endif
-
-namespace views {
-class WidgetDelegate;
-}
-
-#if defined(TOOLKIT_USES_GTK)
-// TODO(msw): To fix as explained above (crbug.com/98322).
 namespace chromeos {
 
+extern const SkColor kBubbleWindowBackgroundColor;
+
 // A window that uses BubbleFrameView as its frame.
-class BubbleWindow : public views::NativeWidgetGtk {
+class BubbleWindow : public views::Widget {
  public:
   static views::Widget* Create(gfx::NativeWindow parent,
                                DialogStyle style,
                                views::WidgetDelegate* widget_delegate);
 
- protected:
-  BubbleWindow(views::Widget* window, DialogStyle style);
-
-  // Overridden from views::NativeWidgetGtk:
-  virtual void InitNativeWidget(
-      const views::Widget::InitParams& params) OVERRIDE;
+  // Overridden from views::Widget:
   virtual views::NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
 
  private:
+  explicit BubbleWindow(DialogStyle style);

[James Cook, 2011/12/06 04:48:34]

nit: Maybe add a virtual destructor just to re-emphasize that this is a derived
class with virtual methods?

[msw, 2011/12/06 06:05:14]

Done.

+
   DialogStyle style_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleWindow);
@@ -49,22 +33,4 @@ class BubbleWindow : public views::NativeWidgetGtk {
 
 }  // namespace chromeos
 
-#else // TOOLKIT_USES_GTK
-
-namespace chromeos {
-
-class BubbleWindow {
- public:
-  static views::Widget* Create(gfx::NativeWindow parent,
-                               DialogStyle style,
-                               views::WidgetDelegate* widget_delegate) {
-    NOTIMPLEMENTED();
-    return NULL;
-  }
-};
-
-}  // namespace chromeos
-
-#endif // TOOLKIT_USES_GTK
-
 #endif  // CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_WINDOW_H_