Remove JS dialog dependency from content.

chrome/browser/tab_contents/background_contents.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/tab_contents/background_contents.h"
 
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
@@ skipping 91 matching lines @@
 }
 
 void BackgroundContents::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) {
-  // TODO(rafaelw): Implement, The JavaScriptModalDialog needs to learn about
-  // BackgroundContents.
+  // TODO(rafaelw): Implement.
+
+  // Since we are suppressing messages, just reply as if the user immediately
+  // pressed "Cancel".
+  OnDialogClosed(reply_msg, false, string16());
+
   *did_suppress_message = true;
 }
 
 bool BackgroundContents::PreHandleKeyboardEvent(
     const NativeWebKeyboardEvent& event,
     bool* is_keyboard_shortcut) {
   return false;
 }
 
 void BackgroundContents::Observe(NotificationType type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   // TODO(rafaelw): Implement pagegroup ref-counting so that non-persistent
   // background pages are closed when the last referencing frame is closed.
   switch (type.value) {
     case NotificationType::PROFILE_DESTROYED:
     case NotificationType::APP_TERMINATING: {
       delete this;
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification sent.";
       break;
   }
 }
 
-void BackgroundContents::OnMessageBoxClosed(IPC::Message* reply_msg,
-                                            bool success,
-                                            const std::wstring& user_input) {
+void BackgroundContents::OnDialogClosed(IPC::Message* reply_msg,
+                                        bool success,
+                                        const string16& user_input) {
   render_view_host()->JavaScriptDialogClosed(reply_msg,
                                              success,
-                                             WideToUTF16Hack(user_input));
+                                             user_input);
 }
 
-gfx::NativeWindow BackgroundContents::GetMessageBoxRootWindow() {
+gfx::NativeWindow BackgroundContents::GetDialogRootWindow() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 TabContents* BackgroundContents::AsTabContents() {
   return NULL;
 }
 
 ExtensionHost* BackgroundContents::AsExtensionHost() {
   return NULL;
@@ skipping 95 matching lines @@
 BackgroundContents*
 BackgroundContents::GetBackgroundContentsByID(int render_process_id,
                                               int render_view_id) {
   RenderViewHost* render_view_host =
       RenderViewHost::FromID(render_process_id, render_view_id);
   if (!render_view_host)
     return NULL;
 
   return render_view_host->delegate()->GetAsBackgroundContents();
 }