Make JavaScript dialogs auto-dismiss on tab switch.

components/app_modal/javascript_dialog_manager.cc

 // Copyright 2014 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/javascript_dialog_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 52 matching lines @@
 
   int32_t newline_count =
       std::count_if(message.begin(), message.end(),
                     [](const base::char16& c) { return c == '\n'; });
   UMA_HISTOGRAM_COUNTS("JSDialogs.CountOfJSDialogMessageNewlines",
                        newline_count);
 }
 
 }  // namespace
 
-////////////////////////////////////////////////////////////////////////////////
-// JavaScriptDialogManager, public:
-
 // static
 JavaScriptDialogManager* JavaScriptDialogManager::GetInstance() {
   return base::Singleton<JavaScriptDialogManager>::get();
 }
 
 void JavaScriptDialogManager::SetNativeDialogFactory(
     std::unique_ptr<JavaScriptNativeDialogFactory> factory) {
   native_dialog_factory_ = std::move(factory);
 }
 
 void JavaScriptDialogManager::SetExtensionsClient(
     std::unique_ptr<JavaScriptDialogExtensionsClient> extensions_client) {
   extensions_client_ = std::move(extensions_client);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// JavaScriptDialogManager, private:
-
 JavaScriptDialogManager::JavaScriptDialogManager()
     : extensions_client_(new DefaultExtensionsClient) {
 }
 
 JavaScriptDialogManager::~JavaScriptDialogManager() {
 }
 
+base::string16 JavaScriptDialogManager::GetTitle(
+    content::WebContents* web_contents,
+    const GURL& origin_url) {
+  // For extensions, show the extension name, but only if the origin of
+  // the alert matches the top-level WebContents.
+  std::string name;
+  if (extensions_client_->GetExtensionName(web_contents, origin_url, &name))
+    return base::UTF8ToUTF16(name);
+
+  // Otherwise, return the formatted URL. For non-standard URLs such as |data:|,
+  // just say "This page".
+  bool is_same_origin_as_main_frame =
+      (web_contents->GetURL().GetOrigin() == origin_url.GetOrigin());
+  if (origin_url.IsStandard() && !origin_url.SchemeIsFile() &&
+      !origin_url.SchemeIsFileSystem()) {
+#if !defined(OS_ANDROID)

[Peter Kasting, 2016/10/18 04:31:04]

Nit: I know you're just moving this code... but could you reverse the arms of
this #if?  "#if !X...else" makes my head hurt.

[Avi (use Gerrit), 2016/10/18 16:31:49]

Done.

+    base::string16 url_string =
+        url_formatter::ElideHost(origin_url, gfx::FontList(), kUrlElideWidth);
+#else
+    base::string16 url_string = url_formatter::FormatUrlForSecurityDisplay(
+        origin_url, url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS);
+#endif
+    return l10n_util::GetStringFUTF16(
+        is_same_origin_as_main_frame ? IDS_JAVASCRIPT_MESSAGEBOX_TITLE
+                                     : IDS_JAVASCRIPT_MESSAGEBOX_TITLE_IFRAME,
+        base::i18n::GetDisplayStringInLTRDirectionality(url_string));
+  }
+  return l10n_util::GetStringUTF16(
+      is_same_origin_as_main_frame
+          ? IDS_JAVASCRIPT_MESSAGEBOX_TITLE_NONSTANDARD_URL
+          : IDS_JAVASCRIPT_MESSAGEBOX_TITLE_NONSTANDARD_URL_IFRAME);
+}
+
 void JavaScriptDialogManager::RunJavaScriptDialog(
     content::WebContents* web_contents,
     const GURL& origin_url,
     content::JavaScriptMessageType message_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     const DialogClosedCallback& callback,
     bool* did_suppress_message)  {
   *did_suppress_message = false;
 
@@ skipping 32 matching lines @@
 
   // Also log the time since a dialog was closed, but only if this is the first
   // dialog that was opened since the closing.
   if (!last_close_time_.is_null()) {
     UMA_HISTOGRAM_MEDIUM_TIMES(
         "JSDialogs.FineTiming.TimeBetweenDialogClosedAndNextDialogCreated",
         now - last_close_time_);
     last_close_time_ = base::TimeTicks();
   }
 
-  bool is_alert = message_type == content::JAVASCRIPT_MESSAGE_TYPE_ALERT;
-  base::string16 dialog_title = GetTitle(web_contents, origin_url, is_alert);
+  base::string16 dialog_title = GetTitle(web_contents, origin_url);
 
   extensions_client_->OnDialogOpened(web_contents);
 
   LogUMAMessageLengthStats(message_text);
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
       web_contents,
       &javascript_dialog_extra_data_,
       dialog_title,
       message_type,
       message_text,
@@ skipping 69 matching lines @@
   if (accept) {
     if (prompt_override)
       dialog->SetOverridePromptText(*prompt_override);
     dialog->native_dialog()->AcceptAppModalDialog();
   } else {
     dialog->native_dialog()->CancelAppModalDialog();
   }
   return true;
 }
 
-base::string16 JavaScriptDialogManager::GetTitle(
-    content::WebContents* web_contents,
-    const GURL& origin_url,
-    bool is_alert) {
-  // For extensions, show the extension name, but only if the origin of
-  // the alert matches the top-level WebContents.
-  std::string name;
-  if (extensions_client_->GetExtensionName(web_contents, origin_url, &name))
-    return base::UTF8ToUTF16(name);
-
-  // Otherwise, return the formatted URL. For non-standard URLs such as |data:|,
-  // just say "This page".
-  bool is_same_origin_as_main_frame =
-      (web_contents->GetURL().GetOrigin() == origin_url.GetOrigin());
-  if (origin_url.IsStandard() && !origin_url.SchemeIsFile() &&
-      !origin_url.SchemeIsFileSystem()) {
-#if !defined(OS_ANDROID)
-    base::string16 url_string =
-        url_formatter::ElideHost(origin_url, gfx::FontList(), kUrlElideWidth);
-#else
-    base::string16 url_string = url_formatter::FormatUrlForSecurityDisplay(
-        origin_url, url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS);
-#endif
-    return l10n_util::GetStringFUTF16(
-        is_same_origin_as_main_frame ? IDS_JAVASCRIPT_MESSAGEBOX_TITLE
-                                     : IDS_JAVASCRIPT_MESSAGEBOX_TITLE_IFRAME,
-        base::i18n::GetDisplayStringInLTRDirectionality(url_string));
-  }
-  return l10n_util::GetStringUTF16(
-      is_same_origin_as_main_frame
-          ? IDS_JAVASCRIPT_MESSAGEBOX_TITLE_NONSTANDARD_URL
-          : IDS_JAVASCRIPT_MESSAGEBOX_TITLE_NONSTANDARD_URL_IFRAME);
-}
-
 void JavaScriptDialogManager::CancelDialogs(content::WebContents* web_contents,
                                             bool suppress_callbacks,
                                             bool reset_state) {
   AppModalDialogQueue* queue = AppModalDialogQueue::GetInstance();
   AppModalDialog* active_dialog = queue->active_dialog();
   for (AppModalDialogQueue::iterator i = queue->begin();
        i != queue->end(); ++i) {
     // Invalidating the active dialog might trigger showing a not-yet
     // invalidated dialog, so invalidate the active dialog last.
     if ((*i) == active_dialog)
@@ skipping 35 matching lines @@
   // lazy background page after the dialog closes. (Dialogs are closed before
   // their WebContents is destroyed so |web_contents| is still valid here.)
   extensions_client_->OnDialogClosed(web_contents);
 
   last_close_time_ = base::TimeTicks::Now();
 
   callback.Run(success, user_input);
 }
 
 }  // namespace app_modal