Re-Revert "[WebModals] New API for browser-scoped popup management."

chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/extension_view_host_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_finder.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
-#include "components/web_modal/popup_manager.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/cocoa/window_size_constants.h"
 
 using content::BrowserContext;
 using content::RenderViewHost;
 using content::WebContents;
@@ skipping 176 matching lines @@
   [super dealloc];
 }
 
 - (void)showDevTools {
   DevToolsWindow::OpenDevToolsWindow(host_->host_contents());
 }
 
 - (void)close {
   // |windowWillClose:| could have already been called. http://crbug.com/279505
   if (host_) {
-    // TODO(gbillock): Change this API to say directly if the current popup
-    // should block tab close? This is a bit over-reaching.
-    web_modal::PopupManager* popup_manager =
-        web_modal::PopupManager::FromWebContents(host_->host_contents());
-    if (popup_manager && popup_manager->IsWebModalDialogActive(
-            host_->host_contents())) {
+    web_modal::WebContentsModalDialogManager* modalDialogManager =
+        web_modal::WebContentsModalDialogManager::FromWebContents(
+            host_->host_contents());
+    if (modalDialogManager &&
+        modalDialogManager->IsDialogActive()) {
       return;
     }
   }
   [super close];
 }
 
 - (void)windowWillClose:(NSNotification *)notification {
   [super windowWillClose:notification];
   if (gPopup == self)
     gPopup = nil;
   if (host_->view())
     static_cast<ExtensionViewMac*>(host_->view())->set_container(NULL);
   host_.reset();
 }
 
 - (void)windowDidResignKey:(NSNotification*)notification {
   // |windowWillClose:| could have already been called. http://crbug.com/279505
   if (host_) {
     // When a modal dialog is opened on top of the popup and when it's closed,
     // it steals key-ness from the popup. Don't close the popup when this
     // happens. There's an extra windowDidResignKey: notification after the
     // modal dialog closes that should also be ignored.
-    web_modal::PopupManager* popupManager =
-        web_modal::PopupManager::FromWebContents(
+    web_modal::WebContentsModalDialogManager* modalDialogManager =
+        web_modal::WebContentsModalDialogManager::FromWebContents(
             host_->host_contents());
-    if (popupManager &&
-        popupManager->IsWebModalDialogActive(host_->host_contents())) {
+    if (modalDialogManager &&
+        modalDialogManager->IsDialogActive()) {
       ignoreWindowDidResignKey_ = YES;
       return;
     }
     if (ignoreWindowDidResignKey_) {
       ignoreWindowDidResignKey_ = NO;
       return;
     }
   }
   if (!beingInspected_)
     [super windowDidResignKey:notification];
@@ skipping 171 matching lines @@
   return minSize;
 }
 
 // Private (TestingAPI)
 + (NSSize)maxPopupSize {
   NSSize maxSize = {ExtensionViewMac::kMaxWidth, ExtensionViewMac::kMaxHeight};
   return maxSize;
 }
 
 @end