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

chrome/browser/ui/views/extensions/extension_dialog.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/ui/views/extensions/extension_dialog.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/dialog_style.h"
 #include "chrome/browser/ui/views/extensions/extension_dialog_observer.h"
 #include "chrome/browser/ui/views/window.h"  // CreateViewsWindow
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "googleurl/src/gurl.h"
 #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
 }
 
 }  // namespace
 
 ExtensionDialog::ExtensionDialog(ExtensionHost* host,
                                  ExtensionDialogObserver* observer)
     : window_(NULL),
@@ skipping 103 matching lines @@
 }
 
 const views::Widget* ExtensionDialog::GetWidget() const {
   return extension_host_->view()->GetWidget();
 }
 
 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.
 
 void ExtensionDialog::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE:
       // If we aren't the host of the popup, then disregard the notification.
       if (content::Details<ExtensionHost>(host()) != details)
         return;
       Close();
       break;
     default:
       NOTREACHED() << L"Received unexpected notification";
       break;
   }
 }