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

chrome/browser/ui/tabs/tab_strip_model.cc

Index: chrome/browser/ui/tabs/tab_strip_model.cc
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc
index 098d89d303ad3d9cef7e7662ddbaec5f78829b3b..168cf85fb69749455cf05433180e147df7b99137 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -21,7 +21,7 @@
 #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/web_contents_modal_dialog_manager.h"
+#include "components/web_modal/popup_manager.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
@@ -315,10 +315,13 @@ void TabStripModel::InsertWebContentsAt(int index,
     data->set_opener(active_contents);
   }
 
-  web_modal::WebContentsModalDialogManager* modal_dialog_manager =
-      web_modal::WebContentsModalDialogManager::FromWebContents(contents);
-  if (modal_dialog_manager)
-    data->set_blocked(modal_dialog_manager->IsDialogActive());
+  // TODO(gbillock): Ask the bubble manager whether the WebContents should be
+  // blocked, or perhaps just by letting the bubble manager make the blocking

[Peter Kasting, 2014/07/10 23:09:01]

Nit: Fix grammar in the second half of this comment now that the first half has
changed.

[Greg Billock, 2014/07/11 17:42:31]

Done.

+  // call directly and not using this at all.
+  web_modal::PopupManager* popup_manager =
+      web_modal::PopupManager::FromWebContents(contents);
+  if (popup_manager)
+    data->set_blocked(popup_manager->IsWebModalDialogActive(contents));
 
   contents_data_.insert(contents_data_.begin() + index, data);