Make JavaScript dialogs auto-dismiss on tab switch.

chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_UI_JAVASCRIPT_DIALOGS_JAVASCRIPT_DIALOG_TAB_HELPER_H_
 #define CHROME_BROWSER_UI_JAVASCRIPT_DIALOGS_JAVASCRIPT_DIALOG_TAB_HELPER_H_
 
+#include <memory>
+
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
+#include "chrome/browser/ui/browser_list_observer.h"
 #include "content/public/browser/javascript_dialog_manager.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
+class JavaScriptDialogViews;
+
+// A class, attached to WebContentses in browser windows, that is the
+// JavaScriptDialogManager for them and handles displaying their dialogs.

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

Nit: Might be nice to expand this some to talk about, or reference other
comments/links about, the policies on auto-dismissing dialogs, not showing
dialogs in non-foremost tabs, etc., as well as the high-level picture of what
parts of this class implement what pieces of that.

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

Done.

 class JavaScriptDialogTabHelper
-    : public content::WebContentsObserver,
-      public content::JavaScriptDialogManager,
+    : public content::JavaScriptDialogManager,
+      public content::WebContentsObserver,
+      public chrome::BrowserListObserver,
       public content::WebContentsUserData<JavaScriptDialogTabHelper> {
  public:
   explicit JavaScriptDialogTabHelper(content::WebContents* web_contents);
   ~JavaScriptDialogTabHelper() override;
 
   // JavaScriptDialogManager:
   void 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) override;
   void RunBeforeUnloadDialog(content::WebContents* web_contents,
                              bool is_reload,
                              const DialogClosedCallback& callback) override;
   bool HandleJavaScriptDialog(content::WebContents* web_contents,
                               bool accept,
                               const base::string16* prompt_override) override;
   void CancelDialogs(content::WebContents* web_contents,
                      bool suppress_callbacks,
                      bool reset_state) override;
-  void WebContentsDestroyed() override;
+
+  // WebContentsObserver:
+  void WasHidden() override;
+
+  // BrowserListObserver:
+  void OnBrowserSetLastActive(Browser* browser) override;
 
  private:
   friend class content::WebContentsUserData<JavaScriptDialogTabHelper>;
 
+  void CloseDialog(bool suppress_callback,
+                   bool success,
+                   const base::string16& user_input);
+
+  // The dialog being displayed on the observed WebContents.
+  base::WeakPtr<JavaScriptDialogViews> dialog_;
+
+  // The callback provided for when the dialog is closed. Usually the dialog
+  // itself calls it, but in the cases where the dialog is closed not by the
+  // user's input but by a call to |CloseDialog()|, this class will call it.

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

Nit: No || on function names (the () is the marker that this is an identifier)

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

Done.

[Peter Kasting, 2016/10/18 16:59:55]

Oh, I was suggesting removing the || rather than removing the ().

Sorry to be pedantic... I dunno quite how we got to the point where we like to
put || around so many things.

+  content::JavaScriptDialogManager::DialogClosedCallback dialog_callback_;
+
   DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogTabHelper);
 };
 
 #endif  // CHROME_BROWSER_UI_JAVASCRIPT_DIALOGS_JAVASCRIPT_DIALOG_TAB_HELPER_H_