| Index: chrome/browser/webshare/share_service_impl.cc
|
| diff --git a/chrome/browser/webshare/share_service_impl.cc b/chrome/browser/webshare/share_service_impl.cc
|
| index 4aca48813cb7b9e3b798b387f6a54bfa1d24fcf9..67e135362ea46e8a30447cae3ee545bd4d0e7c48 100644
|
| --- a/chrome/browser/webshare/share_service_impl.cc
|
| +++ b/chrome/browser/webshare/share_service_impl.cc
|
| @@ -104,10 +104,10 @@ bool ShareServiceImpl::ReplacePlaceholders(base::StringPiece url_template,
|
|
|
| void ShareServiceImpl::ShowPickerDialog(
|
| const std::vector<std::pair<base::string16, GURL>>& targets,
|
| - const base::Callback<void(base::Optional<std::string>)>& callback) {
|
| -// TODO(mgiuca): Get the browser window as |parent_window|.
|
| + chrome::WebShareTargetPickerCallback callback) {
|
| + // TODO(mgiuca): Get the browser window as |parent_window|.
|
| chrome::ShowWebShareTargetPickerDialog(nullptr /* parent_window */, targets,
|
| - callback);
|
| + std::move(callback));
|
| }
|
|
|
| Browser* ShareServiceImpl::GetBrowser() {
|
| @@ -186,9 +186,9 @@ void ShareServiceImpl::Share(const std::string& title,
|
|
|
| ShowPickerDialog(
|
| sufficiently_engaged_targets,
|
| - base::Bind(&ShareServiceImpl::OnPickerClosed, weak_factory_.GetWeakPtr(),
|
| - base::Passed(&share_targets), title, text, share_url,
|
| - callback));
|
| + base::BindOnce(&ShareServiceImpl::OnPickerClosed,
|
| + weak_factory_.GetWeakPtr(), base::Passed(&share_targets),
|
| + title, text, share_url, callback));
|
| }
|
|
|
| void ShareServiceImpl::OnPickerClosed(
|
| @@ -197,7 +197,7 @@ void ShareServiceImpl::OnPickerClosed(
|
| const std::string& text,
|
| const GURL& share_url,
|
| const ShareCallback& callback,
|
| - base::Optional<std::string> result) {
|
| + const base::Optional<std::string>& result) {
|
| if (!result.has_value()) {
|
| callback.Run(blink::mojom::ShareError::CANCELED);
|
| return;
|
|
|