diff options
Diffstat (limited to 'chrome/browser/ui/tabs/tab_strip_model.cc')
| -rw-r--r-- | chrome/browser/ui/tabs/tab_strip_model.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc index 098d89d..eeaf6cf 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 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)); contents_data_.insert(contents_data_.begin() + index, data); |