Commit 073e1952 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Convert content/ to use Bind() for blocks

With https://crrev.com/c/1070158, base::Bind() supports
block via base::RetainBlock(). Converts uses of the now
deprecated base::BindBlock().

Bug: 701275
Change-Id: I759e9bc6d62b933463602ccc3b574be3b47c918b
Reviewed-on: https://chromium-review.googlesource.com/1092572Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565621}
parent 1bb2be02
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <memory> #include <memory>
#include "base/bind.h"
#include "base/lazy_instance.h" #include "base/lazy_instance.h"
#include "base/mac/bind_objc_block.h"
#include "base/mac/scoped_objc_class_swizzler.h" #include "base/mac/scoped_objc_class_swizzler.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
...@@ -132,13 +132,13 @@ void GetStringAtPointForRenderWidget( ...@@ -132,13 +132,13 @@ void GetStringAtPointForRenderWidget(
result_callback) { result_callback) {
TextInputClientMac::GetInstance()->GetStringAtPoint( TextInputClientMac::GetInstance()->GetStringAtPoint(
rwh, point, rwh, point,
base::BindBlock( base::BindOnce(base::RetainBlock(
^(const mac::AttributedStringCoder::EncodedString& encoded_string, ^(const mac::AttributedStringCoder::EncodedString& encoded_string,
gfx::Point baseline_point) { gfx::Point baseline_point) {
std::string string = base::SysNSStringToUTF8( std::string string = base::SysNSStringToUTF8(
[mac::AttributedStringCoder::Decode(&encoded_string) string]); [mac::AttributedStringCoder::Decode(&encoded_string) string]);
result_callback.Run(string, baseline_point); result_callback.Run(string, baseline_point);
})); })));
} }
void GetStringFromRangeForRenderWidget( void GetStringFromRangeForRenderWidget(
...@@ -148,13 +148,13 @@ void GetStringFromRangeForRenderWidget( ...@@ -148,13 +148,13 @@ void GetStringFromRangeForRenderWidget(
result_callback) { result_callback) {
TextInputClientMac::GetInstance()->GetStringFromRange( TextInputClientMac::GetInstance()->GetStringFromRange(
rwh, range, rwh, range,
base::BindBlock( base::BindOnce(base::RetainBlock(
^(const mac::AttributedStringCoder::EncodedString& encoded_string, ^(const mac::AttributedStringCoder::EncodedString& encoded_string,
gfx::Point baseline_point) { gfx::Point baseline_point) {
std::string string = base::SysNSStringToUTF8( std::string string = base::SysNSStringToUTF8(
[mac::AttributedStringCoder::Decode(&encoded_string) string]); [mac::AttributedStringCoder::Decode(&encoded_string) string]);
result_callback.Run(string, baseline_point); result_callback.Run(string, baseline_point);
})); })));
} }
} // namespace content } // namespace content
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment