Oust BubbleWindow from ExtensionDialog, use chromeos::BubbleFrameView directly.

chrome/browser/ui/views/extensions/extension_dialog.cc

Index: chrome/browser/ui/views/extensions/extension_dialog.cc
diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc
index 41e8cdd31b2b99da625542559b873687613dafc0..4e71cdc10e278aa69a4ecbba120702b386e46e57 100644
--- a/chrome/browser/ui/views/extensions/extension_dialog.cc
+++ b/chrome/browser/ui/views/extensions/extension_dialog.cc
@@ -22,20 +22,20 @@
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/frame/bubble_window.h"
+#include "chrome/browser/chromeos/frame/bubble_frame_view.h"
 #endif
 
 namespace {
 
 views::Widget* CreateWindow(gfx::NativeWindow parent,
                             views::WidgetDelegate* delegate) {
-#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
-  // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL
-  // for crbug.com/98322 is landed.
-  // On Chrome OS we need to override the style to suppress padding around
-  // the borders.
-  return chromeos::BubbleWindow::Create(parent,
-      STYLE_FLUSH, delegate);
+#if defined(OS_CHROMEOS)
+  views::Widget* window = new views::Widget;
+  views::Widget::InitParams params;
+  params.delegate = delegate;
+  params.parent = reinterpret_cast<gfx::NativeView>(parent);
+  window->Init(params);
+  return window;
 #else
   return browser::CreateViewsWindow(parent, delegate, STYLE_GENERIC);
 #endif
@@ -159,6 +159,12 @@ views::View* ExtensionDialog::GetContentsView() {
   return extension_host_->view();
 }
 
+#if defined(OS_CHROMEOS)
+views::NonClientFrameView* ExtensionDialog::CreateNonClientFrameView() {
+  return new chromeos::BubbleFrameView(this, STYLE_FLUSH);
+}
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 // content::NotificationObserver overrides.