browser: Rename message_box_handler.* to javascript_dialog_creator.*

chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.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 "chrome/browser/ui/app_modal_dialogs/message_box_handler.h"
+#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
 
 #include <map>
 
 #include "base/compiler_specific.h"
+#include "base/i18n/rtl.h"
 #include "base/memory/singleton.h"
 #include "base/utf_string_conversions.h"
-#include "base/i18n/rtl.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/content_client.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/javascript_message_type.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::JavaScriptDialogCreator;
 using content::WebContents;
 
-class ChromeJavaScriptDialogCreator
-    : public JavaScriptDialogCreator,
-      public content::NotificationObserver {
+namespace {
+
+class ChromeJavaScriptDialogCreator : public JavaScriptDialogCreator,
+                                      public content::NotificationObserver {
  public:
   static ChromeJavaScriptDialogCreator* GetInstance();
 
   explicit ChromeJavaScriptDialogCreator(ExtensionHost* extension_host);
   virtual ~ChromeJavaScriptDialogCreator();
 
   virtual void RunJavaScriptDialog(
       WebContents* web_contents,
       const GURL& origin_url,
       const std::string& accept_lang,
       ui::JavascriptMessageType javascript_message_type,
       const string16& message_text,
       const string16& default_prompt_text,
       const DialogClosedCallback& callback,
       bool* did_suppress_message) OVERRIDE;
 
   virtual void RunBeforeUnloadDialog(
       WebContents* web_contents,
       const string16& message_text,
       bool is_reload,
       const DialogClosedCallback& callback) OVERRIDE;
 
   virtual void ResetJavaScriptState(WebContents* web_contents) OVERRIDE;
 
  private:
-  explicit ChromeJavaScriptDialogCreator();
+  ChromeJavaScriptDialogCreator();
 
   friend struct DefaultSingletonTraits<ChromeJavaScriptDialogCreator>;
 
-  // content::NotificationObserver
+  // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   string16 GetTitle(const GURL& origin_url,
                     const std::string& accept_lang,
                     bool is_alert);
 
   void CancelPendingDialogs(WebContents* web_contents);
 
@@ skipping 12 matching lines @@
   // Extension Host which owns the ChromeJavaScriptDialogCreator instance.
   // It's used to get a extension name from a URL.
   // If it's not owned by any Extension, it should be NULL.
   ExtensionHost* extension_host_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptDialogCreator);
 };
 
-//------------------------------------------------------------------------------
+////////////////////////////////////////////////////////////////////////////////
+// ChromeJavaScriptDialogCreator, public:
 
 ChromeJavaScriptDialogCreator::ChromeJavaScriptDialogCreator()
     : extension_host_(NULL) {
 }
 
 ChromeJavaScriptDialogCreator::~ChromeJavaScriptDialogCreator() {
   extension_host_ = NULL;
 }
 
 ChromeJavaScriptDialogCreator::ChromeJavaScriptDialogCreator(
     ExtensionHost* extension_host)
     : extension_host_(extension_host) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
                  content::Source<Profile>(extension_host_->profile()));
 }
 
-/* static */
+// static
 ChromeJavaScriptDialogCreator* ChromeJavaScriptDialogCreator::GetInstance() {
   return Singleton<ChromeJavaScriptDialogCreator>::get();
 }
 
 void ChromeJavaScriptDialogCreator::RunJavaScriptDialog(
     WebContents* web_contents,
     const GURL& origin_url,
     const std::string& accept_lang,
     ui::JavascriptMessageType javascript_message_type,
     const string16& message_text,
@@ skipping 42 matching lines @@
 }
 
 void ChromeJavaScriptDialogCreator::RunBeforeUnloadDialog(
     WebContents* web_contents,
     const string16& message_text,
     bool is_reload,
     const DialogClosedCallback& callback) {
   ChromeJavaScriptDialogExtraData* extra_data =
       &javascript_dialog_extra_data_[web_contents];
 
-  string16 title = l10n_util::GetStringUTF16(
-      is_reload ?
-      IDS_BEFORERELOAD_MESSAGEBOX_TITLE :
-      IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE);
-  string16 footer = l10n_util::GetStringUTF16(
-      is_reload ?
-      IDS_BEFORERELOAD_MESSAGEBOX_FOOTER :
-      IDS_BEFOREUNLOAD_MESSAGEBOX_FOOTER);
+  const string16 title = l10n_util::GetStringUTF16(is_reload ?
+      IDS_BEFORERELOAD_MESSAGEBOX_TITLE : IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE);
+  const string16 footer = l10n_util::GetStringUTF16(is_reload ?
+      IDS_BEFORERELOAD_MESSAGEBOX_FOOTER : IDS_BEFOREUNLOAD_MESSAGEBOX_FOOTER);
 
   string16 full_message = message_text + ASCIIToUTF16("\n\n") + footer;
 
   if (extension_host_)
     extension_host_->WillRunJavaScriptDialog();
 
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
       web_contents,
       extra_data,
       title,
@@ skipping 57 matching lines @@
   if (active_dialog && active_dialog->web_contents() == web_contents)
     active_dialog->Invalidate();
   for (AppModalDialogQueue::iterator i = queue->begin();
        i != queue->end(); ++i) {
     if ((*i)->web_contents() == web_contents)
       (*i)->Invalidate();
   }
 }
 
 void ChromeJavaScriptDialogCreator::OnDialogClosed(
-    DialogClosedCallback callback, bool success, const string16& user_input) {
+    DialogClosedCallback callback,
+    bool success,
+    const string16& user_input) {
   if (extension_host_)
     extension_host_->DidCloseJavaScriptDialog();
   callback.Run(success, user_input);
 }
 
-//------------------------------------------------------------------------------
+}  // namespace
 
 content::JavaScriptDialogCreator* GetJavaScriptDialogCreatorInstance() {
   return ChromeJavaScriptDialogCreator::GetInstance();
 }
 
 content::JavaScriptDialogCreator* CreateJavaScriptDialogCreatorInstance(
     ExtensionHost* extension_host) {
   return new ChromeJavaScriptDialogCreator(extension_host);
 }