Dismiss action in tab modal dialogs.

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/chrome_notification_types.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/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/extensions/extension_dialog_observer.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 "ui/base/base_window.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/background.h"
 #include "ui/views/widget/widget.h"
 #include "url/gurl.h"
 
 using content::WebContents;
 
 ExtensionDialog::ExtensionDialog(extensions::ExtensionHost* host,
                                  ExtensionDialogObserver* observer)
-    : window_(NULL),
-      extension_host_(host),
+    : extension_host_(host),
       observer_(observer) {
   AddRef();  // Balanced in DeleteDelegate();
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
                  content::Source<Profile>(host->profile()));
   // Listen for the containing view calling window.close();
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                  content::Source<Profile>(host->profile()));
   // Listen for a crash or other termination of the extension process.
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED,
@@ skipping 50 matching lines @@
   DCHECK(manager);
   if (!manager)
     return NULL;
   return manager->CreateDialogHost(url);
 }
 
 void ExtensionDialog::InitWindow(ui::BaseWindow* base_window,
                                  int width,
                                  int height) {
   gfx::NativeWindow parent = base_window->GetNativeWindow();
-  window_ = CreateBrowserModalDialogViews(this, parent);
+  views::Widget* window = CreateBrowserModalDialogViews(this, 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);
   bounds_rect.AdjustToFit(screen_rect);
-  window_->SetBounds(bounds_rect);
+  window->SetBounds(bounds_rect);
 
-  window_->Show();
+  window->Show();
   // TODO(jamescook): Remove redundant call to Activate()?
-  window_->Activate();
+  window->Activate();
 }
 
 void ExtensionDialog::ObserverDestroyed() {
   observer_ = NULL;
 }
 
-void ExtensionDialog::Close() {
-  if (!window_)
-    return;
-
-  window_->Close();
-  window_ = NULL;
-}
-
 void ExtensionDialog::MaybeFocusRenderView() {
   views::FocusManager* focus_manager = GetWidget()->GetFocusManager();
   DCHECK(focus_manager != NULL);
 
   // Already there's a focused view, so no need to switch the focus.
   if (focus_manager->GetFocusedView())
     return;
 
   content::RenderWidgetHostView* view = host()->render_view_host()->GetView();
   if (!view)
@@ skipping 75 matching lines @@
       extension_host_->view()->set_background(NULL);
       // The render view is created during the LoadURL(), so we should
       // set the focus to the view if nobody else takes the focus.
       if (content::Details<extensions::ExtensionHost>(host()) == details)
         MaybeFocusRenderView();
       break;
     case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE:
       // If we aren't the host of the popup, then disregard the notification.
       if (content::Details<extensions::ExtensionHost>(host()) != details)
         return;
-      Close();
+      GetWidget()->Close();
       break;
     case chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED:
       if (content::Details<extensions::ExtensionHost>(host()) != details)
         return;
       if (observer_)
         observer_->ExtensionTerminated(this);
       break;
     default:
       NOTREACHED() << L"Received unexpected notification";
       break;
   }
 }