From ca42325ade4a07b14515aa49223482244e734150 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Mar 2018 11:35:53 +0900
Subject: [PATCH] Make OnMessageBoxCallback a method since it is accessing
 members

---
 .../browser/atom_javascript_dialog_manager.cc | 22 +++++++++----------
 atom/browser/atom_javascript_dialog_manager.h |  9 ++++----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/atom/browser/atom_javascript_dialog_manager.cc b/atom/browser/atom_javascript_dialog_manager.cc
index 34253e8b925f..1f0536b4c292 100644
--- a/atom/browser/atom_javascript_dialog_manager.cc
+++ b/atom/browser/atom_javascript_dialog_manager.cc
@@ -64,13 +64,14 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog(
       checkbox_string = "Prevent this app from creating additional dialogs";
     }
   }
-  atom::ShowMessageBox(NativeWindow::FromWebContents(web_contents),
-                       atom::MessageBoxType::MESSAGE_BOX_TYPE_NONE, buttons, -1,
-                       0, atom::MessageBoxOptions::MESSAGE_BOX_NONE, "",
-                       base::UTF16ToUTF8(message_text), "", checkbox_string,
-                       false, gfx::ImageSkia(),
-                       base::Bind(&OnMessageBoxCallback, callback, origin,
-                                  &origin_counts_));
+  atom::ShowMessageBox(
+      NativeWindow::FromWebContents(web_contents),
+      atom::MessageBoxType::MESSAGE_BOX_TYPE_NONE, buttons, -1, 0,
+      atom::MessageBoxOptions::MESSAGE_BOX_NONE, "",
+      base::UTF16ToUTF8(message_text), "", checkbox_string,
+      false, gfx::ImageSkia(),
+      base::Bind(&AtomJavaScriptDialogManager::OnMessageBoxCallback,
+                 base::Unretained(this), callback, origin));
 }
 
 void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
@@ -87,16 +88,13 @@ void AtomJavaScriptDialogManager::CancelDialogs(
     bool reset_state) {
 }
 
-// static
 void AtomJavaScriptDialogManager::OnMessageBoxCallback(
     const DialogClosedCallback& callback,
     const std::string& origin,
-    std::map<std::string, int>* origin_counts_,
     int code,
     bool checkbox_checked) {
-  if (checkbox_checked) {
-    (*origin_counts_)[origin] = kUserWantsNoMoreDialogs;
-  }
+  if (checkbox_checked)
+    origin_counts_[origin] = kUserWantsNoMoreDialogs;
   callback.Run(code == 0, base::string16());
 }
 
diff --git a/atom/browser/atom_javascript_dialog_manager.h b/atom/browser/atom_javascript_dialog_manager.h
index 7849d755c10c..0f5e55403be9 100644
--- a/atom/browser/atom_javascript_dialog_manager.h
+++ b/atom/browser/atom_javascript_dialog_manager.h
@@ -37,11 +37,10 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
                      bool reset_state) override;
 
  private:
-  static void OnMessageBoxCallback(const DialogClosedCallback& callback,
-                                   const std::string& origin,
-                                   std::map<std::string, int>* origins_,
-                                   int code,
-                                   bool checkbox_checked);
+  void OnMessageBoxCallback(const DialogClosedCallback& callback,
+                            const std::string& origin,
+                            int code,
+                            bool checkbox_checked);
 
   api::WebContents* api_web_contents_;
   std::map<std::string, int> origin_counts_;