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

Unified Diff: chrome/browser/ui/extensions/shell_window.h

Issue 14969012: components: Create web_modal component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-before-land 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
« no previous file with comments | « chrome/browser/ui/extensions/native_app_window.h ('k') | chrome/browser/ui/extensions/shell_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/extensions/shell_window.h
diff --git a/chrome/browser/ui/extensions/shell_window.h b/chrome/browser/ui/extensions/shell_window.h
index fa3813d5eb14994996332420bc07a805ed9c1ade..ee83cc5a178880e1383c4b1ae19665650798b3b7 100644
--- a/chrome/browser/ui/extensions/shell_window.h
+++ b/chrome/browser/ui/extensions/shell_window.h
@@ -10,7 +10,7 @@
#include "chrome/browser/extensions/extension_keybinding_registry.h"
#include "chrome/browser/sessions/session_id.h"
#include "chrome/browser/ui/base_window.h"
-#include "chrome/browser/ui/web_contents_modal_dialog_manager_delegate.h"
+#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_contents_delegate.h"
@@ -67,7 +67,7 @@ class ShellWindowContents {
class ShellWindow : public content::NotificationObserver,
public content::WebContentsDelegate,
public extensions::ExtensionKeybindingRegistry::Delegate,
- public WebContentsModalDialogManagerDelegate {
+ public ChromeWebModalDialogManagerDelegate {
public:
enum WindowType {
WINDOW_TYPE_DEFAULT = 1 << 0, // Default shell window.
@@ -260,11 +260,9 @@ class ShellWindow : public content::NotificationObserver,
virtual extensions::ActiveTabPermissionGranter*
GetActiveTabPermissionGranter() OVERRIDE;
- // WebContentsModalDialogManagerDelegate implementation.
- virtual void SetWebContentsBlocked(content::WebContents* web_contents,
- bool blocked) OVERRIDE;
-
- virtual WebContentsModalDialogHost* GetWebContentsModalDialogHost() OVERRIDE;
+ // web_modal::WebContentsModalDialogManagerDelegate implementation.
+ virtual web_modal::WebContentsModalDialogHost*
+ GetWebContentsModalDialogHost() OVERRIDE;
// Callback from web_contents()->DownloadFavicon.
void DidDownloadFavicon(int id,
« no previous file with comments | « chrome/browser/ui/extensions/native_app_window.h ('k') | chrome/browser/ui/extensions/shell_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698