Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(763)

Unified Diff: chrome/browser/ui/tabs/tab_strip_model.cc

Issue 23311008: Tab Strip: Initialize the blocked state for a tab. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix test for win aura Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/tabs/tab_strip_model.cc
===================================================================
--- chrome/browser/ui/tabs/tab_strip_model.cc (revision 220060)
+++ chrome/browser/ui/tabs/tab_strip_model.cc (working copy)
@@ -20,6 +20,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 "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
#include "content/public/browser/render_process_host.h"
@@ -188,6 +189,11 @@
data->opener = active_contents;
}
+ web_modal::WebContentsModalDialogManager* modal_dialog_manager =
+ web_modal::WebContentsModalDialogManager::FromWebContents(contents);
+ if (modal_dialog_manager)
+ data->blocked = modal_dialog_manager->IsShowingDialog();
+
contents_data_.insert(contents_data_.begin() + index, data);
selection_model_.IncrementFrom(index);
« no previous file with comments | « no previous file | chrome/browser/ui/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698