Make BubbleWindow a Widget override with a BubbleFrameView.

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"
-#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);
-#else
-  return browser::CreateViewsWindow(parent, delegate, STYLE_GENERIC);
-#endif
-}
-
-}  // namespace
-
 ExtensionDialog::ExtensionDialog(ExtensionHost* host,
                                  ExtensionDialogObserver* observer)
     : window_(NULL),
       extension_host_(host),
       observer_(observer) {
   AddRef();  // Balanced in DeleteDelegate();
 
   // Listen for the containing view calling window.close();
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                  content::Source<Profile>(host->profile()));
@@ skipping 31 matching lines @@
   ExtensionProcessManager* manager =
       browser->profile()->GetExtensionProcessManager();
   DCHECK(manager);
   if (!manager)
     return NULL;
   return manager->CreateDialogHost(url, browser);
 }
 
 void ExtensionDialog::InitWindow(Browser* browser, int width, int height) {
   gfx::NativeWindow parent = browser->window()->GetNativeHandle();
-  window_ = CreateWindow(parent, this /* views::WidgetDelegate */);
+#if defined(OS_CHROMEOS)
+  DialogStyle style = STYLE_FLUSH;
+#else
+  DialogStyle style = STYLE_GENERIC;
+#endif
+  window_ = browser::CreateViewsWindow(parent, this, style);
 
   // Center the window over the browser.
   gfx::Point center = browser->window()->GetBounds().CenterPoint();
   int x = center.x() - width / 2;
   int y = center.y() - height / 2;
   window_->SetBounds(gfx::Rect(x, y, width, height));
 
   window_->Show();
   window_->Activate();
 }
@@ skipping 62 matching lines @@
       // 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;
   }
 }