Remove JS dialog dependency from content.

chrome/browser/extensions/extension_host.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_host.h"
 
 #include <list>
 
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browsing_instance.h"
+#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/bindings_policy.h"
+#include "content/common/content_client.h"
 #include "content/common/native_web_keyboard_event.h"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/context_menu.h"
 
@@ skipping 73 matching lines @@
                              ViewType::Type host_type)
     : extension_(extension),
       extension_id_(extension->id()),
       profile_(site_instance->browsing_instance()->profile()),
       did_stop_loading_(false),
       document_element_available_(false),
       url_(url),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           extension_function_dispatcher_(profile_, this)),
       extension_host_type_(host_type),
-      associated_tab_contents_(NULL),
-      suppress_javascript_messages_(false) {
+      associated_tab_contents_(NULL) {
   render_view_host_ = new RenderViewHost(site_instance, this, MSG_ROUTING_NONE,
                                          NULL);
   if (enable_dom_automation_)
     render_view_host_->AllowBindings(BindingsPolicy::DOM_AUTOMATION);
 
   // Listen for when the render process' handle is available so we can add it
   // to the task manager then.
   registrar_.Add(this, NotificationType::RENDERER_PROCESS_CREATED,
                  Source<RenderProcessHost>(render_process_host()));
   // Listen for when an extension is unloaded from the same profile, as it may
   // be the same extension that this points to.
   registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
                  Source<Profile>(profile_));
 }
 
 ExtensionHost::~ExtensionHost() {
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_HOST_DESTROYED,
       Source<Profile>(profile_),
       Details<ExtensionHost>(this));
   ProcessCreationQueue::GetInstance()->Remove(this);
+  content::GetContentClient()->browser()->ResetJavaScriptState(this);
   render_view_host_->Shutdown();  // deletes render_view_host
 }
 
 void ExtensionHost::CreateView(Browser* browser) {
 #if defined(TOOLKIT_VIEWS)
   view_.reset(new ExtensionView(this, browser));
   // We own |view_|, so don't auto delete when it's removed from the view
   // hierarchy.
   view_->set_parent_owned(false);
 #elif defined(OS_MACOSX)
@@ skipping 239 matching lines @@
   }
 }
 
 void ExtensionHost::RunJavaScriptMessage(const RenderViewHost* rvh,
                                          const string16& message,
                                          const string16& default_prompt,
                                          const GURL& frame_url,
                                          const int flags,
                                          IPC::Message* reply_msg,
                                          bool* did_suppress_message) {
-  base::TimeDelta time_since_last_message(
-      base::TimeTicks::Now() - last_javascript_message_dismissal_);
+  bool suppress_this_message = false;
+  content::GetContentClient()->browser()->RunJavaScriptDialog(
+      this,
+      frame_url,
+      flags,
+      message,
+      default_prompt,
+      reply_msg,
+      &suppress_this_message,
+      profile());
 
-  *did_suppress_message = suppress_javascript_messages_;
-  if (!suppress_javascript_messages_) {
-    bool show_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))
-      show_suppress_checkbox = true;
+  if (suppress_this_message) {
+    // If we are suppressing messages, just reply as if the user immediately
+    // pressed "Cancel".
+    OnDialogClosed(reply_msg, false, string16());
+  }
 
-    // Unlike for page alerts, navigations aren't a good signal for when to
-    // resume showing alerts, so we can't reasonably stop showing them even if
-    // the extension is spammy.
-    RunJavascriptMessageBox(profile_,
-                            this,
-                            frame_url,
-                            flags,
-                            UTF16ToWideHack(message),
-                            UTF16ToWideHack(default_prompt),
-                            show_suppress_checkbox,
-                            reply_msg);
-  } else {
-    // If we are suppressing messages, just reply as is if the user immediately
-    // pressed "Cancel".
-    OnMessageBoxClosed(reply_msg, false, std::wstring());
-  }
+  *did_suppress_message = suppress_this_message;
 }
 
-gfx::NativeWindow ExtensionHost::GetMessageBoxRootWindow() {
+gfx::NativeWindow ExtensionHost::GetDialogRootWindow() {
   // If we have a view, use that.
   gfx::NativeView native_view = GetNativeViewOfHost();
   if (native_view)
     return platform_util::GetTopLevel(native_view);
 
   // Otherwise, try the active tab's view.
   Browser* browser = extension_function_dispatcher_.GetCurrentBrowser(
       render_view_host_, true);
   if (browser) {
     TabContents* active_tab = browser->GetSelectedTabContents();
     if (active_tab)
       return active_tab->view()->GetTopLevelNativeWindow();
   }
 
   return NULL;
 }
 
 TabContents* ExtensionHost::AsTabContents() {
   return NULL;
 }
 
 ExtensionHost* ExtensionHost::AsExtensionHost() {
   return this;
 }
 
-void ExtensionHost::OnMessageBoxClosed(IPC::Message* reply_msg,
-                                       bool success,
-                                       const std::wstring& user_input) {
-  last_javascript_message_dismissal_ = base::TimeTicks::Now();
+void ExtensionHost::OnDialogClosed(IPC::Message* reply_msg,
+                                   bool success,
+                                   const string16& user_input) {
   render_view_host()->JavaScriptDialogClosed(reply_msg,
                                              success,
-                                             WideToUTF16Hack(user_input));
-}
-
-void ExtensionHost::SetSuppressMessageBoxes(bool suppress_message_boxes) {
-  suppress_javascript_messages_ = suppress_message_boxes;
+                                             user_input);
 }
 
 void ExtensionHost::Close(RenderViewHost* render_view_host) {
   if (extension_host_type_ == ViewType::EXTENSION_POPUP ||
       extension_host_type_ == ViewType::EXTENSION_DIALOG ||
       extension_host_type_ == ViewType::EXTENSION_INFOBAR) {
     NotificationService::current()->Notify(
         NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
         Source<Profile>(profile_),
         Details<ExtensionHost>(this));
@@ skipping 325 matching lines @@
   return window_id;
 }
 
 void ExtensionHost::OnRunFileChooser(
     const ViewHostMsg_RunFileChooser_Params& params) {
   if (file_select_helper_.get() == NULL)
     file_select_helper_.reset(new FileSelectHelper(profile()));
   file_select_helper_->RunFileChooser(render_view_host_,
                                       GetAssociatedTabContents(), params);
 }