Componentize app_modal_dialog

chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.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/javascript_dialog_manager.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/singleton.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
-#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
-#include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
-#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/grit/generated_resources.h"
+#include "components/app_modal_dialogs/app_modal_dialog.h"
+#include "components/app_modal_dialogs/app_modal_dialog_queue.h"
+#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
+#include "components/app_modal_dialogs/native_app_modal_dialog.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/javascript_message_type.h"
+#include "grit/components_strings.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/process_manager.h"
 #endif  // defined(ENABLE_EXTENSIONS)
 
 using content::BrowserContext;
 using content::JavaScriptDialogManager;
 using content::WebContents;
 
 #if defined(ENABLE_EXTENSIONS)
 using extensions::Extension;
 #endif  // defined(ENABLE_EXTENSIONS)
 
 namespace {
 
+// If a WebContents is impolite and displays a second JavaScript alert within
+// kJavaScriptMessageExpectedDelay of a previous JavaScript alert being
+// dismissed, display an option to suppress future alerts from this WebContents.
+const int kJavaScriptMessageExpectedDelay = 1000;

[msw, 2014/10/22 22:53:31]

optional nit: move this within the function's scope.

[oshima, 2014/10/23 00:44:11]

Done.

+
 #if defined(ENABLE_EXTENSIONS)
 // Returns the ProcessManager for the browser context from |web_contents|.
 extensions::ProcessManager* GetExtensionsProcessManager(
     WebContents* web_contents) {
   return extensions::ExtensionSystem::Get(
       web_contents->GetBrowserContext())->process_manager();
 }
 
 // Returns the extension associated with |web_contents| or NULL if there is no
 // associated extension (or extensions are not supported).
@@ skipping 117 matching lines @@
     *did_suppress_message = true;
     return;
   }
 
   base::TimeDelta time_since_last_message = base::TimeTicks::Now() -
       extra_data->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)) {
+      base::TimeDelta::FromMilliseconds(kJavaScriptMessageExpectedDelay)) {
     display_suppress_checkbox = true;
   } else {
     display_suppress_checkbox = false;
   }
 
   bool is_alert = message_type == content::JAVASCRIPT_MESSAGE_TYPE_ALERT;
   base::string16 dialog_title =
       GetTitle(web_contents, origin_url, accept_lang, is_alert);
 
   IncrementLazyKeepaliveCount(web_contents);
@@ skipping 124 matching lines @@
   DecrementLazyKeepaliveCount(web_contents);
 
   callback.Run(success, user_input);
 }
 
 }  // namespace
 
 content::JavaScriptDialogManager* GetJavaScriptDialogManagerInstance() {
   return ChromeJavaScriptDialogManager::GetInstance();
 }