| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index e85c898ef9b999352dc0ba99165aaf668882d785..8c0ea21c078d97e483b1c69cf460bea604d4a094 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) {
|
| + ChromeWebModalDialogManagerDelegate::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();
|
| }
|
|
|
|
|