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

chrome/browser/ui/tabs/tab_strip_model.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/tabs/tab_strip_model.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
 #include "apps/ui/web_contents_sizer.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_order_controller.h"
 #include "chrome/common/url_constants.h"
-#include "components/web_modal/popup_manager.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 using base::UserMetricsAction;
 using content::WebContents;
 
 namespace {
 
 // Returns true if the specified transition is one of the types that cause the
@@ skipping 273 matching lines @@
     data->set_opener(active_contents);
   } else if ((add_types & ADD_INHERIT_OPENER) && active_contents) {
     if (active) {
       // Forget any existing relationships, we don't want to make things too
       // confusing by having multiple groups active at the same time.
       ForgetAllOpeners();
     }
     data->set_opener(active_contents);
   }
 
-  // TODO(gbillock): Ask the bubble manager whether the WebContents should be
-  // blocked, or just let the bubble manager make the blocking call directly
-  // and not use this at all.
-  web_modal::PopupManager* popup_manager =
-      web_modal::PopupManager::FromWebContents(contents);
-  if (popup_manager)
-    data->set_blocked(popup_manager->IsWebModalDialogActive(contents));
+  web_modal::WebContentsModalDialogManager* modal_dialog_manager =
+      web_modal::WebContentsModalDialogManager::FromWebContents(contents);
+  if (modal_dialog_manager)
+    data->set_blocked(modal_dialog_manager->IsDialogActive());
 
   contents_data_.insert(contents_data_.begin() + index, data);
 
   selection_model_.IncrementFrom(index);
 
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
                     TabInsertedAt(contents, index, active));
   if (active) {
     ui::ListSelectionModel new_model;
     new_model.Copy(selection_model_);
@@ skipping 1074 matching lines @@
 void TabStripModel::ForgetOpenersAndGroupsReferencing(
     const WebContents* tab) {
   for (WebContentsDataVector::const_iterator i = contents_data_.begin();
        i != contents_data_.end(); ++i) {
     if ((*i)->group() == tab)
       (*i)->set_group(NULL);
     if ((*i)->opener() == tab)
       (*i)->set_opener(NULL);
   }
 }