mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Make OnMessageBoxCallback a method since it is accessing members

Browse source
This commit is contained in:
Cheng Zhao 2018-03-06 11:35:53 +09:00
parent 7516b059fe
commit ca42325ade
2 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
atom/browser/atom_javascript_dialog_manager.cc
View file

@ -64,13 +64,14 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog(
checkbox_string = "Prevent this app from creating additional dialogs"; checkbox_string = "Prevent this app from creating additional dialogs";
} }
} }
atom::ShowMessageBox(NativeWindow::FromWebContents(web_contents), atom::ShowMessageBox(
atom::MessageBoxType::MESSAGE_BOX_TYPE_NONE, buttons, -1, NativeWindow::FromWebContents(web_contents),
0, atom::MessageBoxOptions::MESSAGE_BOX_NONE, "", atom::MessageBoxType::MESSAGE_BOX_TYPE_NONE, buttons, -1, 0,
base::UTF16ToUTF8(message_text), "", checkbox_string, atom::MessageBoxOptions::MESSAGE_BOX_NONE, "",
false, gfx::ImageSkia(), base::UTF16ToUTF8(message_text), "", checkbox_string,
base::Bind(&OnMessageBoxCallback, callback, origin, false, gfx::ImageSkia(),
&origin_counts_)); base::Bind(&AtomJavaScriptDialogManager::OnMessageBoxCallback,
base::Unretained(this), callback, origin));
} }
void AtomJavaScriptDialogManager::RunBeforeUnloadDialog( void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
@ -87,16 +88,13 @@ void AtomJavaScriptDialogManager::CancelDialogs(
bool reset_state) { bool reset_state) {
} }
// static
void AtomJavaScriptDialogManager::OnMessageBoxCallback( void AtomJavaScriptDialogManager::OnMessageBoxCallback(
const DialogClosedCallback& callback, const DialogClosedCallback& callback,
const std::string& origin, const std::string& origin,
std::map<std::string, int>* origin_counts_,
int code, int code,
bool checkbox_checked) { bool checkbox_checked) {
if (checkbox_checked) { if (checkbox_checked)
(*origin_counts_)[origin] = kUserWantsNoMoreDialogs; origin_counts_[origin] = kUserWantsNoMoreDialogs;
}
callback.Run(code == 0, base::string16()); callback.Run(code == 0, base::string16());
} }

9
atom/browser/atom_javascript_dialog_manager.h
View file

@ -37,11 +37,10 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
bool reset_state) override; bool reset_state) override;
private: private:
static void OnMessageBoxCallback(const DialogClosedCallback& callback, void OnMessageBoxCallback(const DialogClosedCallback& callback,
const std::string& origin, const std::string& origin,
std::map<std::string, int>* origins_, int code,
int code, bool checkbox_checked);
bool checkbox_checked);
api::WebContents* api_web_contents_; api::WebContents* api_web_contents_;
std::map<std::string, int> origin_counts_; std::map<std::string, int> origin_counts_;