diff --git a/atom/browser/api/atom_api_power_monitor.cc b/atom/browser/api/atom_api_power_monitor.cc index e623a8dd7e24..e6cd74894085 100644 --- a/atom/browser/api/atom_api_power_monitor.cc +++ b/atom/browser/api/atom_api_power_monitor.cc @@ -140,7 +140,8 @@ void Initialize(v8::Local exports, void* priv) { v8::Isolate* isolate = context->GetIsolate(); mate::Dictionary dict(isolate, exports); - dict.Set("createPowerMonitor", base::Bind(&PowerMonitor::Create, isolate)); + dict.Set("createPowerMonitor", + base::BindRepeating(&PowerMonitor::Create, isolate)); dict.Set("PowerMonitor", PowerMonitor::GetConstructor(isolate) ->GetFunction(context) .ToLocalChecked()); diff --git a/atom/browser/api/atom_api_render_process_preferences.cc b/atom/browser/api/atom_api_render_process_preferences.cc index dd96b0030ee6..fc24cd4f67c2 100644 --- a/atom/browser/api/atom_api_render_process_preferences.cc +++ b/atom/browser/api/atom_api_render_process_preferences.cc @@ -64,9 +64,9 @@ void RenderProcessPreferences::BuildPrototype( // static mate::Handle RenderProcessPreferences::ForAllWebContents(v8::Isolate* isolate) { - return mate::CreateHandle(isolate, - new RenderProcessPreferences( - isolate, base::Bind(&IsWebContents, isolate))); + return mate::CreateHandle( + isolate, new RenderProcessPreferences( + isolate, base::BindRepeating(&IsWebContents, isolate))); } } // namespace api diff --git a/atom/browser/api/atom_api_screen.cc b/atom/browser/api/atom_api_screen.cc index cd83f95d1633..6a770f8e08e2 100644 --- a/atom/browser/api/atom_api_screen.cc +++ b/atom/browser/api/atom_api_screen.cc @@ -163,7 +163,7 @@ void Initialize(v8::Local exports, void* priv) { v8::Isolate* isolate = context->GetIsolate(); mate::Dictionary dict(isolate, exports); - dict.Set("createScreen", base::Bind(&Screen::Create, isolate)); + dict.Set("createScreen", base::BindRepeating(&Screen::Create, isolate)); dict.Set( "Screen", Screen::GetConstructor(isolate)->GetFunction(context).ToLocalChecked()); diff --git a/atom/browser/api/stream_subscriber.cc b/atom/browser/api/stream_subscriber.cc index 3b2a4d02ef7d..98f2f8e23747 100644 --- a/atom/browser/api/stream_subscriber.cc +++ b/atom/browser/api/stream_subscriber.cc @@ -28,9 +28,9 @@ StreamSubscriber::StreamSubscriber( DCHECK(ui_task_runner->RunsTasksInCurrentSequence()); auto weak_self = weak_factory_.GetWeakPtr(); - On("data", base::Bind(&StreamSubscriber::OnData, weak_self)); - On("end", base::Bind(&StreamSubscriber::OnEnd, weak_self)); - On("error", base::Bind(&StreamSubscriber::OnError, weak_self)); + On("data", base::BindRepeating(&StreamSubscriber::OnData, weak_self)); + On("end", base::BindRepeating(&StreamSubscriber::OnEnd, weak_self)); + On("error", base::BindRepeating(&StreamSubscriber::OnError, weak_self)); } StreamSubscriber::~StreamSubscriber() { @@ -80,20 +80,20 @@ void StreamSubscriber::OnData(mate::Arguments* args) { // Pass the data to the URLJob in IO thread. std::vector buffer(data, data + length); base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO}, - base::Bind(&atom::URLRequestStreamJob::OnData, - url_job_, base::Passed(&buffer))); + base::BindOnce(&atom::URLRequestStreamJob::OnData, + url_job_, base::Passed(&buffer))); } void StreamSubscriber::OnEnd(mate::Arguments* args) { base::PostTaskWithTraits( FROM_HERE, {content::BrowserThread::IO}, - base::Bind(&atom::URLRequestStreamJob::OnEnd, url_job_)); + base::BindOnce(&atom::URLRequestStreamJob::OnEnd, url_job_)); } void StreamSubscriber::OnError(mate::Arguments* args) { base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO}, - base::Bind(&atom::URLRequestStreamJob::OnError, - url_job_, net::ERR_FAILED)); + base::BindOnce(&atom::URLRequestStreamJob::OnError, + url_job_, net::ERR_FAILED)); } void StreamSubscriber::RemoveAllListeners() { diff --git a/atom/browser/api/stream_subscriber.h b/atom/browser/api/stream_subscriber.h index 6f241075aef4..62c63dbb6d8c 100644 --- a/atom/browser/api/stream_subscriber.h +++ b/atom/browser/api/stream_subscriber.h @@ -40,7 +40,7 @@ class StreamSubscriber friend class base::RefCountedDeleteOnSequence; using JSHandlersMap = std::map>; - using EventCallback = base::Callback; + using EventCallback = base::RepeatingCallback; ~StreamSubscriber(); diff --git a/atom/browser/atom_blob_reader.cc b/atom/browser/atom_blob_reader.cc index 9ea4c5bc375f..3e7a2701bc8c 100644 --- a/atom/browser/atom_blob_reader.cc +++ b/atom/browser/atom_blob_reader.cc @@ -81,8 +81,8 @@ void AtomBlobReader::BlobReadHelper::Read() { DCHECK_CURRENTLY_ON(BrowserThread::IO); storage::BlobReader::Status size_status = blob_reader_->CalculateSize( - base::Bind(&AtomBlobReader::BlobReadHelper::DidCalculateSize, - base::Unretained(this))); + base::BindOnce(&AtomBlobReader::BlobReadHelper::DidCalculateSize, + base::Unretained(this))); if (size_status != storage::BlobReader::Status::IO_PENDING) DidCalculateSize(net::OK); } @@ -100,8 +100,8 @@ void AtomBlobReader::BlobReadHelper::DidCalculateSize(int result) { scoped_refptr blob_data = new net::IOBuffer(static_cast(total_size)); auto callback = - base::Bind(&AtomBlobReader::BlobReadHelper::DidReadBlobData, - base::Unretained(this), base::RetainedRef(blob_data)); + base::BindRepeating(&AtomBlobReader::BlobReadHelper::DidReadBlobData, + base::Unretained(this), base::RetainedRef(blob_data)); storage::BlobReader::Status read_status = blob_reader_->Read(blob_data.get(), total_size, &bytes_read, callback); if (read_status != storage::BlobReader::Status::IO_PENDING) diff --git a/atom/browser/atom_browser_main_parts_posix.cc b/atom/browser/atom_browser_main_parts_posix.cc index 3f0e5327d3af..f35ab6748e47 100644 --- a/atom/browser/atom_browser_main_parts_posix.cc +++ b/atom/browser/atom_browser_main_parts_posix.cc @@ -136,10 +136,10 @@ void ShutdownDetector::ThreadMain() { bytes_read += ret; } while (bytes_read < sizeof(signal)); VLOG(1) << "Handling shutdown for signal " << signal << "."; - base::Closure task = - base::Bind(&Browser::Quit, base::Unretained(Browser::Get())); - if (!base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, task)) { + if (!base::PostTaskWithTraits( + FROM_HERE, {BrowserThread::UI}, + base::BindOnce(&Browser::Quit, base::Unretained(Browser::Get())))) { // Without a UI thread to post the exit task to, there aren't many // options. Raise the signal again. The default handler will pick it up // and cause an ungraceful exit. diff --git a/atom/browser/atom_resource_dispatcher_host_delegate.cc b/atom/browser/atom_resource_dispatcher_host_delegate.cc index 4fdf651ba602..ffde11253f2c 100644 --- a/atom/browser/atom_resource_dispatcher_host_delegate.cc +++ b/atom/browser/atom_resource_dispatcher_host_delegate.cc @@ -94,9 +94,9 @@ bool AtomResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream( *origin = GURL(kPdfViewerUIOrigin); base::PostTaskWithTraits( FROM_HERE, {BrowserThread::UI}, - base::Bind(&OnPdfResourceIntercepted, request->url(), - render_process_host_id, render_frame_id, - info->GetWebContentsGetterForRequest())); + base::BindOnce(&OnPdfResourceIntercepted, request->url(), + render_process_host_id, render_frame_id, + info->GetWebContentsGetterForRequest())); return true; } #endif // BUILDFLAG(ENABLE_PDF_VIEWER) diff --git a/atom/browser/ui/webui/pdf_viewer_handler.cc b/atom/browser/ui/webui/pdf_viewer_handler.cc index 2e1d1b28d528..300c65636e44 100644 --- a/atom/browser/ui/webui/pdf_viewer_handler.cc +++ b/atom/browser/ui/webui/pdf_viewer_handler.cc @@ -76,22 +76,23 @@ void PdfViewerHandler::SetPdfResourceStream(content::StreamInfo* stream) { void PdfViewerHandler::RegisterMessages() { web_ui()->RegisterMessageCallback( - "initialize", - base::Bind(&PdfViewerHandler::Initialize, base::Unretained(this))); + "initialize", base::BindRepeating(&PdfViewerHandler::Initialize, + base::Unretained(this))); web_ui()->RegisterMessageCallback( - "getDefaultZoom", - base::Bind(&PdfViewerHandler::GetInitialZoom, base::Unretained(this))); + "getDefaultZoom", base::BindRepeating(&PdfViewerHandler::GetInitialZoom, + base::Unretained(this))); web_ui()->RegisterMessageCallback( - "getInitialZoom", - base::Bind(&PdfViewerHandler::GetInitialZoom, base::Unretained(this))); + "getInitialZoom", base::BindRepeating(&PdfViewerHandler::GetInitialZoom, + base::Unretained(this))); web_ui()->RegisterMessageCallback( "setZoom", - base::Bind(&PdfViewerHandler::SetZoom, base::Unretained(this))); + base::BindRepeating(&PdfViewerHandler::SetZoom, base::Unretained(this))); web_ui()->RegisterMessageCallback( - "getStrings", - base::Bind(&PdfViewerHandler::GetStrings, base::Unretained(this))); + "getStrings", base::BindRepeating(&PdfViewerHandler::GetStrings, + base::Unretained(this))); web_ui()->RegisterMessageCallback( - "reload", base::Bind(&PdfViewerHandler::Reload, base::Unretained(this))); + "reload", + base::BindRepeating(&PdfViewerHandler::Reload, base::Unretained(this))); } void PdfViewerHandler::OnJavascriptAllowed() { diff --git a/atom/browser/ui/webui/pdf_viewer_ui.cc b/atom/browser/ui/webui/pdf_viewer_ui.cc index 8750824c5ad0..62504317ac82 100644 --- a/atom/browser/ui/webui/pdf_viewer_ui.cc +++ b/atom/browser/ui/webui/pdf_viewer_ui.cc @@ -187,9 +187,9 @@ class PdfViewerUI::ResourceRequester base::PostTaskWithTraits( FROM_HERE, {BrowserThread::UI}, - base::Bind(&CallMigrationCallback, - base::Passed(&stream_response_cb_), - base::Passed(&stream_info_))); + base::BindOnce(&CallMigrationCallback, + base::Passed(&stream_response_cb_), + base::Passed(&stream_info_))); } private: @@ -246,9 +246,9 @@ void PdfViewerUI::RenderFrameCreated(content::RenderFrameHost* rfh) { resource_requester_ = new ResourceRequester(std::move(callback)); base::PostTaskWithTraits( FROM_HERE, {BrowserThread::IO}, - base::Bind(&ResourceRequester::StartRequest, resource_requester_, - GURL(src_), GURL(kPdfViewerUIOrigin), render_process_id, - render_view_id, render_frame_id, resource_context)); + base::BindOnce(&ResourceRequester::StartRequest, resource_requester_, + GURL(src_), GURL(kPdfViewerUIOrigin), render_process_id, + render_view_id, render_frame_id, resource_context)); } void PdfViewerUI::OnSaveURLAs(const GURL& url,