| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index ec42e1bc75f5770b0630c2431f2eb5372f852db1..419c2180d933f99a9105db3bf7a07362a9aef44d 100644
|
| --- a/chrome/browser/ui/browser.h
|
| +++ b/chrome/browser/ui/browser.h
|
| @@ -24,13 +24,13 @@
|
| #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
|
| #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
|
| #include "chrome/browser/ui/browser_navigator.h"
|
| +#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
|
| #include "chrome/browser/ui/host_desktop.h"
|
| #include "chrome/browser/ui/search/search_model_observer.h"
|
| #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
|
| #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
| #include "chrome/browser/ui/toolbar/toolbar_model.h"
|
| -#include "chrome/browser/ui/web_contents_modal_dialog_manager_delegate.h"
|
| #include "chrome/browser/ui/zoom/zoom_observer.h"
|
| #include "chrome/common/content_settings.h"
|
| #include "chrome/common/content_settings_types.h"
|
| @@ -63,7 +63,6 @@ class TabStripModel;
|
| class TabStripModelDelegate;
|
| struct SearchMode;
|
| struct WebApplicationInfo;
|
| -class WebContentsModalDialogHost;
|
|
|
| namespace chrome {
|
| class BrowserCommandController;
|
| @@ -90,11 +89,15 @@ struct SelectedFileInfo;
|
| class WebDialogDelegate;
|
| }
|
|
|
| +namespace web_modal {
|
| +class WebContentsModalDialogHost;
|
| +}
|
| +
|
| class Browser : public TabStripModelObserver,
|
| public content::WebContentsDelegate,
|
| public CoreTabHelperDelegate,
|
| public SearchEngineTabHelperDelegate,
|
| - public WebContentsModalDialogManagerDelegate,
|
| + public ChromeWebModalDialogManagerDelegate,
|
| public BlockedContentTabHelperDelegate,
|
| public BookmarkTabHelperDelegate,
|
| public ZoomObserver,
|
| @@ -637,7 +640,7 @@ class Browser : public TabStripModelObserver,
|
| // Overridden from WebContentsModalDialogManagerDelegate:
|
| virtual void SetWebContentsBlocked(content::WebContents* web_contents,
|
| bool blocked) OVERRIDE;
|
| - virtual WebContentsModalDialogHost*
|
| + virtual web_modal::WebContentsModalDialogHost*
|
| GetWebContentsModalDialogHost() OVERRIDE;
|
|
|
| // Overridden from BlockedContentTabHelperDelegate:
|
|
|