Remove the extension dialog extra border.

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

 // Copyright (c) 2012 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/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/base_window.h"
 #include "chrome/browser/ui/views/extensions/extension_dialog_observer.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/background.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_ASH)
-#include "ash/shell.h"
-#include "ui/aura/root_window.h"
-#endif
-
 using content::WebContents;
 
 ExtensionDialog::ExtensionDialog(extensions::ExtensionHost* host,
                                  ExtensionDialogObserver* observer)
     : window_(NULL),
       extension_host_(host),
       observer_(observer) {
   AddRef();  // Balanced in DeleteDelegate();
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
@@ skipping 17 matching lines @@
     WebContents* web_contents,
     int width,
     int height,
     const string16& title,
     ExtensionDialogObserver* observer) {
   extensions::ExtensionHost* host = CreateExtensionHost(url, profile);
   if (!host)
     return NULL;
   host->SetAssociatedWebContents(web_contents);
 
-  return ExtensionDialog::ShowInternal(url, base_window, host, width, height,
-                                       false, title, observer);
-}
-
-#if defined(USE_AURA)
-// static
-ExtensionDialog* ExtensionDialog::ShowFullscreen(
-    const GURL& url,
-    Profile* profile,
-    const string16& title,
-    ExtensionDialogObserver* observer) {
-  extensions::ExtensionHost* host = CreateExtensionHost(url, profile);
-  if (!host)
-    return NULL;
-
-  return ExtensionDialog::ShowInternal(url, NULL, host, 0, 0,
-                                       true, title, observer);
-}
-#endif
-
-// static
-ExtensionDialog* ExtensionDialog::ShowInternal(
-    const GURL& url,
-    BaseWindow* base_window,
-    extensions::ExtensionHost* host,
-    int width,
-    int height,
-    bool fullscreen,
-    const string16& title,
-    ExtensionDialogObserver* observer) {
-  CHECK(fullscreen || base_window);
+  CHECK(base_window);
   ExtensionDialog* dialog = new ExtensionDialog(host, observer);
   dialog->set_title(title);
-
-  if (fullscreen)
-    dialog->InitWindowFullscreen();
-  else
-    dialog->InitWindow(base_window, width, height);
+  dialog->InitWindow(base_window, width, height);
 
   // Show a white background while the extension loads.  This is prettier than
   // flashing a black unfilled window frame.
   host->view()->set_background(
       views::Background::CreateSolidBackground(0xFF, 0xFF, 0xFF));
   host->view()->SetVisible(true);
 
   // Ensure the DOM JavaScript can respond immediately to keyboard shortcuts.
   host->host_contents()->GetView()->Focus();
   return dialog;
 }
 
 // static
 extensions::ExtensionHost* ExtensionDialog::CreateExtensionHost(
     const GURL& url,
     Profile* profile) {
   DCHECK(profile);
   ExtensionProcessManager* manager =
       extensions::ExtensionSystem::Get(profile)->process_manager();
 
   DCHECK(manager);
   if (!manager)
     return NULL;
   return manager->CreateDialogHost(url);
 }
 
-#if defined(USE_ASH)
-void ExtensionDialog::InitWindowFullscreen() {
-  aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow();
-  gfx::Rect screen_rect =
-      ash::Shell::GetScreen()->GetDisplayNearestWindow(root_window).bounds();
-
-  // We want to be the fullscreen topmost child of the root window.
-  window_ = new views::Widget;
-  views::Widget::InitParams params(
-      views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  params.delegate = this;
-  params.parent = root_window;
-  window_->Init(params);
-  window_->StackAtTop();
-  window_->SetBounds(screen_rect);
-  window_->Show();
-
-  // TODO(jamescook): Remove redundant call to Activate()?
-  window_->Activate();
-}
-#else
-void ExtensionDialog::InitWindowFullscreen() {
-  NOTIMPLEMENTED();
-}
-#endif
-
-
 void ExtensionDialog::InitWindow(BaseWindow* base_window,
                                  int width,
                                  int height) {
   gfx::NativeWindow parent = base_window->GetNativeWindow();
-  window_ = views::Widget::CreateWindowWithParent(this, parent);
+  window_ = views::DialogDelegate::CreateDialogWidget(this, NULL, parent);
 
   // Center the window over the browser.
   gfx::Point center = base_window->GetBounds().CenterPoint();
   int x = center.x() - width / 2;
   int y = center.y() - height / 2;
   // Ensure the top left and top right of the window are on screen, with
   // priority given to the top left.
   gfx::Rect screen_rect = gfx::Screen::GetScreenFor(parent)->
       GetDisplayNearestPoint(center).bounds();
   gfx::Rect bounds_rect = gfx::Rect(x, y, width, height);
@@ skipping 31 matching lines @@
 
   // TODO(oshima): Views + aura doesn't seem to update the views focus
   // manager when an aura window gets focus. This is a workaround for
   // this issue. Fix it this and remove this workaround.
   // See bug.com/127222.
   focus_manager->SetFocusedView(GetContentsView());
   view->Focus();
 }
 
 /////////////////////////////////////////////////////////////////////////////
-// views::WidgetDelegate overrides.
+// views::DialogDelegate overrides.
+
+int ExtensionDialog::GetDialogButtons() const {
+  // The only user, SelectFileDialogExtension, provides its own buttons.
+  return ui::DIALOG_BUTTON_NONE;
+}
 
 bool ExtensionDialog::CanResize() const {
   // Can resize only if minimum contents size set.
   return extension_host_->view()->GetPreferredSize() != gfx::Size();
 }
 
 void ExtensionDialog::SetMinimumContentsSize(int width, int height) {
   extension_host_->view()->SetPreferredSize(gfx::Size(width, height));
 }
 
@@ skipping 57 matching lines @@
       if (content::Details<extensions::ExtensionHost>(host()) != details)
         return;
       if (observer_)
         observer_->ExtensionTerminated(this);
       break;
     default:
       NOTREACHED() << L"Received unexpected notification";
       break;
   }
 }