Implement WebContentsModalDialogManagerDelegate for ShellWindow

chrome/browser/ui/extensions/shell_window.cc

Index: chrome/browser/ui/extensions/shell_window.cc
diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc
index dec6c73d04fa9c3e14a62fc8baf4b25af00d53e4..78c789248f6b43cdec4f005650b785eda07672da 100644
--- a/chrome/browser/ui/extensions/shell_window.cc
+++ b/chrome/browser/ui/extensions/shell_window.cc
@@ -109,6 +109,8 @@ void ShellWindow::Init(const GURL& url,
   FaviconTabHelper::CreateForWebContents(web_contents);
 
   web_contents->SetDelegate(this);
+  WebContentsModalDialogManager::FromWebContents(web_contents)->
+      set_delegate(this);
   extensions::SetViewType(web_contents, extensions::VIEW_TYPE_APP_SHELL);
 
   // Initialize the window
@@ -500,6 +502,14 @@ extensions::ActiveTabPermissionGranter*
   return NULL;
 }
 
+void ShellWindow::SetWebContentsBlocked(content::WebContents* web_contents,
+                                        bool blocked) {
+}
+
+WebContentsModalDialogHost* ShellWindow::GetWebContentsModalDialogHost() {
+  return native_app_window_.get();
+}
+
 void ShellWindow::AddMessageToDevToolsConsole(ConsoleMessageLevel level,
                                               const std::string& message) {
   content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();