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

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

Issue 13588007: Implement WebContentsModalDialogManagerDelegate for ShellWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove newlines in headers Created 7 years, 9 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 bd3e4e3e8a08863a7ae7a75a8969a73924bd840a..33363626f7f6587102b0ebeceeba76d3052442e7 100644
--- a/chrome/browser/ui/extensions/shell_window.h
+++ b/chrome/browser/ui/extensions/shell_window.h
@@ -10,6 +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 "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_contents_delegate.h"
@@ -64,7 +65,8 @@ class ShellWindowContents {
// have a WebContents but none of the chrome of normal browser windows.
class ShellWindow : public content::NotificationObserver,
public content::WebContentsDelegate,
- public extensions::ExtensionKeybindingRegistry::Delegate {
+ public extensions::ExtensionKeybindingRegistry::Delegate,
+ public WebContentsModalDialogManagerDelegate {
public:
enum WindowType {
WINDOW_TYPE_DEFAULT, // Default shell window
@@ -239,6 +241,12 @@ 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;
+
// Callback from web_contents()->DownloadFavicon.
void DidDownloadFavicon(int id,
const GURL& image_url,
« 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