Remove JS dialog dependency from content.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 1a2f44d9b0805c3eb0858cf54365a16193bd226a..4ca80a95e5752fc6bd8773954099993b1487e2bb 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -28,8 +28,14 @@
 #include "chrome/browser/renderer_host/text_input_client_message_filter.h"
 #include "chrome/browser/search_engines/search_provider_install_state_message_filter.h"
 #include "chrome/browser/spellcheck_message_filter.h"
+#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
+#include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h"
+#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
+#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/child_process_logging.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/pref_names.h"
@@ -115,6 +121,77 @@ void InitRenderViewHostForExtensions(RenderViewHost* render_view_host) {
 
 namespace chrome {
 
+class ChromeContentBrowserClient::JavaScriptDialogDelegateProxy
+    : ChromeJavaScriptDialogDelegate {
+ public:
+  explicit JavaScriptDialogDelegateProxy(
+      content::JavaScriptDialogDelegate* original);
+
+  virtual void OnDialogClosed(IPC::Message* reply_msg,
+                              bool success,
+                              const string16& user_input) OVERRIDE;
+  virtual gfx::NativeWindow GetDialogRootWindow() OVERRIDE;
+  virtual TabContents* AsTabContents() OVERRIDE;
+  virtual void SetSuppressDialogs(bool suppress_dialogs) OVERRIDE;
+  virtual ExtensionHost* AsExtensionHost() OVERRIDE;
+
+ private:
+  friend class ChromeContentBrowserClient;
+
+  // The JavaScriptDialogDelegate this object is proxying.
+  content::JavaScriptDialogDelegate* original_;
+
+  // The time that the last JavaScript dialog was dismissed.
+  base::TimeTicks last_javascript_message_dismissal_;
+
+  // True if the user has decided to block future JavaScript dialogs.
+  bool suppress_javascript_messages_;
+};
+
+ChromeContentBrowserClient::JavaScriptDialogDelegateProxy::
+    JavaScriptDialogDelegateProxy(content::JavaScriptDialogDelegate* original)
+        : original_(original),
+          last_javascript_message_dismissal_(base::TimeTicks()),
+          suppress_javascript_messages_(false) {
+}
+
+gfx::NativeWindow
+ChromeContentBrowserClient::JavaScriptDialogDelegateProxy::GetDialogRootWindow(
+    ) {
+  return original_->GetDialogRootWindow();
+}
+
+void ChromeContentBrowserClient::JavaScriptDialogDelegateProxy::OnDialogClosed(
+    IPC::Message* reply_msg,
+    bool success,
+    const string16& user_input) {
+  last_javascript_message_dismissal_ = base::TimeTicks::Now();
+  original_->OnDialogClosed(reply_msg, success, user_input);
+}
+
+TabContents*
+ChromeContentBrowserClient::JavaScriptDialogDelegateProxy::AsTabContents() {
+  return original_->AsTabContents();
+}
+
+ExtensionHost*
+ChromeContentBrowserClient::JavaScriptDialogDelegateProxy::AsExtensionHost() {
+  return original_->AsExtensionHost();
+}
+
+void
+ChromeContentBrowserClient::JavaScriptDialogDelegateProxy::SetSuppressDialogs(
+    bool suppress_dialogs) {
+  suppress_javascript_messages_ = suppress_dialogs;
+}
+
+ChromeContentBrowserClient::ChromeContentBrowserClient() {
+}
+
+ChromeContentBrowserClient::~ChromeContentBrowserClient() {
+  STLDeleteValues(&javascript_dialog_proxies_);
+}
+
 void ChromeContentBrowserClient::RenderViewHostCreated(
     RenderViewHost* render_view_host) {
   new ChromeRenderViewHostObserver(render_view_host);
@@ -323,6 +400,95 @@ void ChromeContentBrowserClient::RevealFolderInOS(const FilePath& path) {
 #endif
 }
 
+void ChromeContentBrowserClient::RunJavaScriptDialog(
+    content::JavaScriptDialogDelegate* delegate,
+    const GURL& frame_url,
+    int dialog_flags,
+    const string16& message_text,
+    const string16& default_prompt_text,
+    IPC::Message* reply_message,
+    bool* did_suppress_message,
+    Profile* profile) {
+  *did_suppress_message = false;
+
+  // Suppress JavaScript dialogs when inside a constrained popup window (because
+  // that activates them and breaks them out of the constrained window jail).
+  if (delegate->AsTabContents()) {
+    TabContentsWrapper* wrapper =
+        TabContentsWrapper::GetCurrentWrapperForContents(
+            delegate->AsTabContents());
+    TabContentsWrapper* constraining_contents = wrapper;
+    if (wrapper && wrapper->blocked_content_tab_helper()->delegate())
+      constraining_contents = wrapper->blocked_content_tab_helper()->
+          delegate()->GetConstrainingContentsWrapper(wrapper);
+    if (constraining_contents != wrapper) {
+      *did_suppress_message = true;
+      return;
+    }
+  }
+
+  JavaScriptDialogDelegateProxy* proxy = ProxyForDelegate(delegate);
+
+  if (proxy->suppress_javascript_messages_) {
+    *did_suppress_message = true;
+    return;
+  }
+
+  base::TimeDelta time_since_last_message = base::TimeTicks::Now() -
+      proxy->last_javascript_message_dismissal_;
+  bool display_suppress_checkbox = false;
+  // Show a checkbox offering to suppress further messages if this message is
+  // being displayed within kJavascriptMessageExpectedDelay of the last one.
+  if (time_since_last_message <
+      base::TimeDelta::FromMilliseconds(
+          chrome::kJavascriptMessageExpectedDelay)) {
+    display_suppress_checkbox = true;
+  }
+
+  RunJavascriptDialogImpl(profile,
+                          proxy,
+                          frame_url,
+                          dialog_flags,
+                          message_text,
+                          default_prompt_text,
+                          display_suppress_checkbox,
+                          reply_message);
+}
+
+void ChromeContentBrowserClient::RunBeforeUnloadDialog(
+    content::JavaScriptDialogDelegate* delegate,
+    const string16& message_text,
+    IPC::Message* reply_msg) {
+  JavaScriptDialogDelegateProxy* proxy = ProxyForDelegate(delegate);
+  RunBeforeUnloadDialogImpl(proxy, message_text, reply_msg);
+}
+
+void ChromeContentBrowserClient::ResetJavaScriptState(
+    content::JavaScriptDialogDelegate* delegate) {
+  JavaScriptDialogProxyMap::iterator proxy_iterator =
+      javascript_dialog_proxies_.find(delegate);
+  if (proxy_iterator != javascript_dialog_proxies_.end()) {
+    delete proxy_iterator->second;
+    javascript_dialog_proxies_.erase(proxy_iterator);
+  }
+}
+
+ChromeContentBrowserClient::JavaScriptDialogDelegateProxy*
+ChromeContentBrowserClient::ProxyForDelegate(
+    content::JavaScriptDialogDelegate* delegate) {
+  JavaScriptDialogProxyMap::iterator proxy_iterator =
+      javascript_dialog_proxies_.find(delegate);
+  if (proxy_iterator == javascript_dialog_proxies_.end()) {
+    JavaScriptDialogDelegateProxy* proxy =
+        new JavaScriptDialogDelegateProxy(delegate);
+    proxy_iterator =
+        javascript_dialog_proxies_.
+            insert(std::make_pair(delegate, proxy)).first;
+  }
+
+  return proxy_iterator->second;
+}
+
 #if defined(OS_LINUX)
 int ChromeContentBrowserClient::GetCrashSignalFD(
     const std::string& process_type) {