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

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

Issue 14969012: components: Create web_modal component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-gtk-build Created 7 years, 7 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
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index e85c898ef9b999352dc0ba99165aaf668882d785..31b5ca5e132d36e68b6e777d3eeb56c018197c0d 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -131,7 +131,6 @@
#include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
#include "chrome/browser/ui/unload_controller.h"
#include "chrome/browser/ui/web_applications/web_app_ui.h"
-#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
#include "chrome/browser/ui/window_sizer/window_sizer.h"
@@ -151,6 +150,7 @@
#include "chrome/common/startup_metric_utils.h"
#include "chrome/common/url_constants.h"
#include "chrome/common/web_apps.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "content/public/browser/color_chooser.h"
#include "content/public/browser/devtools_manager.h"
#include "content/public/browser/download_item.h"
@@ -219,6 +219,7 @@ using content::UserMetricsAction;
using content::WebContents;
using extensions::Extension;
using ui::WebDialogDelegate;
+using web_modal::WebContentsModalDialogManager;
///////////////////////////////////////////////////////////////////////////////
@@ -1675,10 +1676,12 @@ void Browser::ConfirmAddSearchProvider(TemplateURL* template_url,
}
///////////////////////////////////////////////////////////////////////////////
-// Browser, WebContentsModalDialogManagerDelegate implementation:
+// Browser, web_modal::WebContentsModalDialogManagerDelegate implementation:
void Browser::SetWebContentsBlocked(content::WebContents* web_contents,
bool blocked) {
+ ChromeModalDialogManagerDelegate::SetWebContentsBlocked(web_contents,
+ blocked);
int index = tab_strip_model_->GetIndexOfWebContents(web_contents);
if (index == TabStripModel::kNoTab) {
NOTREACHED();
@@ -1689,7 +1692,8 @@ void Browser::SetWebContentsBlocked(content::WebContents* web_contents,
web_contents->GetView()->Focus();
}
-WebContentsModalDialogHost* Browser::GetWebContentsModalDialogHost() {
+web_modal::WebContentsModalDialogHost*
+Browser::GetWebContentsModalDialogHost() {
return window_->GetWebContentsModalDialogHost();
}

Powered by Google App Engine
This is Rietveld 408576698