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

DialogClosedCallback are not const references anymore

Browse source
This commit is contained in:
Samuel Attard 2017-12-18 12:24:13 +11:00 • committed by Aleksei Kuzmin
parent de2981a767
commit ce755483ba
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/atom_javascript_dialog_manager.cc
View file

@ -35,7 +35,7 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog(
JavaScriptDialogType dialog_type, JavaScriptDialogType dialog_type,
const base::string16& message_text, const base::string16& message_text,
const base::string16& default_prompt_text, const base::string16& default_prompt_text,
const DialogClosedCallback& callback, DialogClosedCallback callback,
bool* did_suppress_message) { bool* did_suppress_message) {
const std::string origin = origin_url.GetOrigin().spec(); const std::string origin = origin_url.GetOrigin().spec();
if (origin_counts_[origin] == kUserWantsNoMoreDialogs) { if (origin_counts_[origin] == kUserWantsNoMoreDialogs) {
@ -79,7 +79,7 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog(
void AtomJavaScriptDialogManager::RunBeforeUnloadDialog( void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
content::WebContents* web_contents, content::WebContents* web_contents,
bool is_reload, bool is_reload,
const DialogClosedCallback& callback) { DialogClosedCallback callback) {
bool default_prevented = api_web_contents_->Emit("will-prevent-unload"); bool default_prevented = api_web_contents_->Emit("will-prevent-unload");
callback.Run(default_prevented, base::string16()); callback.Run(default_prevented, base::string16());
return; return;

4
atom/browser/atom_javascript_dialog_manager.h
View file

@ -27,12 +27,12 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
content::JavaScriptDialogType dialog_type, content::JavaScriptDialogType dialog_type,
const base::string16& message_text, const base::string16& message_text,
const base::string16& default_prompt_text, const base::string16& default_prompt_text,
const DialogClosedCallback& callback, DialogClosedCallback callback,
bool* did_suppress_message) override; bool* did_suppress_message) override;
void RunBeforeUnloadDialog( void RunBeforeUnloadDialog(
content::WebContents* web_contents, content::WebContents* web_contents,
bool is_reload, bool is_reload,
const DialogClosedCallback& callback) override; DialogClosedCallback callback) override;
void CancelDialogs(content::WebContents* web_contents, void CancelDialogs(content::WebContents* web_contents,
bool reset_state) override; bool reset_state) override;