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

Fix build error caused by base::Passed changes

Browse source
This commit is contained in:
Cheng Zhao 2018-03-12 17:27:43 +09:00 • committed by Aleksei Kuzmin
parent b08d086b0f
commit d141d2445d
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/atom_javascript_dialog_manager.cc
View file

@ -37,9 +37,9 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog(
const base::string16& default_prompt_text, const base::string16& default_prompt_text,
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) {
return callback.Run(false, base::string16()); return std::move(callback).Run(false, base::string16());
} }
if (dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_ALERT && if (dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_ALERT &&
@ -73,7 +73,9 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog(
base::UTF16ToUTF8(message_text), "", checkbox_string, base::UTF16ToUTF8(message_text), "", checkbox_string,
false, gfx::ImageSkia(), false, gfx::ImageSkia(),
base::Bind(&AtomJavaScriptDialogManager::OnMessageBoxCallback, base::Bind(&AtomJavaScriptDialogManager::OnMessageBoxCallback,
base::Unretained(this), callback, origin)); base::Unretained(this),
base::Passed(std::move(callback)),
origin));
} }
void AtomJavaScriptDialogManager::RunBeforeUnloadDialog( void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
@ -91,13 +93,13 @@ void AtomJavaScriptDialogManager::CancelDialogs(
} }
void AtomJavaScriptDialogManager::OnMessageBoxCallback( void AtomJavaScriptDialogManager::OnMessageBoxCallback(
const DialogClosedCallback& callback, DialogClosedCallback callback,
const std::string& origin, const std::string& origin,
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()); std::move(callback).Run(code == 0, base::string16());
} }
} // namespace atom } // namespace atom

2
atom/browser/atom_javascript_dialog_manager.h
View file

@ -37,7 +37,7 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
bool reset_state) override; bool reset_state) override;
private: private:
void OnMessageBoxCallback(const DialogClosedCallback& callback, void OnMessageBoxCallback(DialogClosedCallback callback,
const std::string& origin, const std::string& origin,
int code, int code,
bool checkbox_checked); bool checkbox_checked);

1
atom/browser/web_contents_preferences.cc
View file

@ -16,6 +16,7 @@
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "cc/base/switches.h" #include "cc/base/switches.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "content/public/common/web_preferences.h" #include "content/public/common/web_preferences.h"