Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

components/app_modal_dialogs/javascript_app_modal_dialog.cc

 // Copyright (c) 2012 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 "components/app_modal_dialogs/javascript_app_modal_dialog.h"
 
-#include "components/app_modal_dialogs/javascript_dialog_manager_impl.h"
+#include "components/app_modal_dialogs/javascript_dialog_manager.h"
 #include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/text_elider.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #endif
 
-using content::JavaScriptDialogManager;
 using content::WebContents;
 
 namespace {
 
 // Control maximum sizes of various texts passed to us from javascript.
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 // Two-dimensional eliding.  Reformat the text of the message dialog
 // inserting line breaks because otherwise a single long line can overflow
 // the message dialog (and crash/hang the GTK, depending on the version).
 const int kMessageTextMaxRows = 32;
@@ skipping 34 matching lines @@
 JavaScriptAppModalDialog::JavaScriptAppModalDialog(
     WebContents* web_contents,
     ExtraDataMap* extra_data_map,
     const base::string16& title,
     content::JavaScriptMessageType javascript_message_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     bool display_suppress_checkbox,
     bool is_before_unload_dialog,
     bool is_reload,
-    const JavaScriptDialogManager::DialogClosedCallback& callback)
+    const content::JavaScriptDialogManager::DialogClosedCallback& callback)
     : AppModalDialog(web_contents, title),
       extra_data_map_(extra_data_map),
       javascript_message_type_(javascript_message_type),
       display_suppress_checkbox_(display_suppress_checkbox),
       is_before_unload_dialog_(is_before_unload_dialog),
       is_reload_(is_reload),
       callback_(callback),
       use_override_prompt_text_(false) {
   EnforceMaxTextSize(message_text, &message_text_);
   EnforceMaxPromptSize(default_prompt_text, &default_prompt_text_);
 }
 
 JavaScriptAppModalDialog::~JavaScriptAppModalDialog() {
 }
 
 NativeAppModalDialog* JavaScriptAppModalDialog::CreateNativeDialog() {
   gfx::NativeWindow parent_window = web_contents()->GetTopLevelNativeWindow();
 
 #if defined(USE_AURA)
   if (!parent_window->GetRootWindow()) {
     // When we are part of a WebContents that isn't actually being displayed on
     // the screen, we can't actually attach to it.
     parent_window = NULL;
   }
 #endif  // defined(USE_AURA)
-  return JavaScriptDialogManagerImpl::GetInstance()->native_dialog_factory()->
+  return JavaScriptDialogManager::GetInstance()->native_dialog_factory()->
       CreateNativeJavaScriptDialog(this, parent_window);
 }
 
 bool JavaScriptAppModalDialog::IsJavaScriptModalDialog() {
   return true;
 }
 
 void JavaScriptAppModalDialog::Invalidate() {
   if (!IsValid())
     return;
@@ skipping 45 matching lines @@
                                               bool suppress_js_messages) {
   if (!IsValid())
     return;
 
   if (!callback_.is_null()) {
     callback_.Run(success, user_input);
     callback_.Reset();
   }
 
   // The callback_ above may delete web_contents_, thus removing the extra
-  // data from the map owned by ChromeJavaScriptDialogManager. Make sure
+  // data from the map owned by ::JavaScriptDialogManager. Make sure
   // to only use the data if still present. http://crbug.com/236476
   ExtraDataMap::iterator extra_data = extra_data_map_->find(web_contents());
   if (extra_data != extra_data_map_->end()) {
     extra_data->second.last_javascript_message_dismissal_ =
         base::TimeTicks::Now();
     extra_data->second.suppress_javascript_messages_ = suppress_js_messages;
   }
 
   // On Views, we can end up coming through this code path twice :(.
   // See crbug.com/63732.
   AppModalDialog::Invalidate();
 }