Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(919)

Side by Side Diff: extensions/browser/api/mime_handler_private/mime_handler_private.cc

Issue 2080083002: Revert of Deletes mojo::Callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/api/mime_handler_private/mime_handler_private.h" 5 #include "extensions/browser/api/mime_handler_private/mime_handler_private.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "content/public/browser/stream_handle.h" 10 #include "content/public/browser/stream_handle.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 base::WeakPtr<StreamContainer> stream_container, 58 base::WeakPtr<StreamContainer> stream_container,
59 mojo::InterfaceRequest<mime_handler::MimeHandlerService> request) 59 mojo::InterfaceRequest<mime_handler::MimeHandlerService> request)
60 : stream_(stream_container), 60 : stream_(stream_container),
61 binding_(this, std::move(request)), 61 binding_(this, std::move(request)),
62 weak_factory_(this) {} 62 weak_factory_(this) {}
63 63
64 MimeHandlerServiceImpl::~MimeHandlerServiceImpl() { 64 MimeHandlerServiceImpl::~MimeHandlerServiceImpl() {
65 } 65 }
66 66
67 void MimeHandlerServiceImpl::GetStreamInfo( 67 void MimeHandlerServiceImpl::GetStreamInfo(
68 const GetStreamInfoCallback& callback) { 68 const mojo::Callback<void(mime_handler::StreamInfoPtr)>& callback) {
69 if (!stream_) { 69 if (!stream_) {
70 callback.Run(mime_handler::StreamInfoPtr()); 70 callback.Run(mime_handler::StreamInfoPtr());
71 return; 71 return;
72 } 72 }
73 callback.Run(mojo::ConvertTo<mime_handler::StreamInfoPtr>(*stream_)); 73 callback.Run(mojo::ConvertTo<mime_handler::StreamInfoPtr>(*stream_));
74 } 74 }
75 75
76 void MimeHandlerServiceImpl::AbortStream(const AbortStreamCallback& callback) { 76 void MimeHandlerServiceImpl::AbortStream(
77 const mojo::Callback<void()>& callback) {
77 if (!stream_) { 78 if (!stream_) {
78 callback.Run(); 79 callback.Run();
79 return; 80 return;
80 } 81 }
81 stream_->Abort(base::Bind(&MimeHandlerServiceImpl::OnStreamClosed, 82 stream_->Abort(base::Bind(&MimeHandlerServiceImpl::OnStreamClosed,
82 weak_factory_.GetWeakPtr(), callback)); 83 weak_factory_.GetWeakPtr(), callback));
83 } 84 }
84 85
85 void MimeHandlerServiceImpl::OnStreamClosed( 86 void MimeHandlerServiceImpl::OnStreamClosed(
86 const AbortStreamCallback& callback) { 87 const mojo::Callback<void()>& callback) {
87 callback.Run(); 88 callback.Run();
88 } 89 }
89 90
90 } // namespace extensions 91 } // namespace extensions
91 92
92 namespace mojo { 93 namespace mojo {
93 94
94 extensions::mime_handler::StreamInfoPtr TypeConverter< 95 extensions::mime_handler::StreamInfoPtr TypeConverter<
95 extensions::mime_handler::StreamInfoPtr, 96 extensions::mime_handler::StreamInfoPtr,
96 extensions::StreamContainer>::Convert(const extensions::StreamContainer& 97 extensions::StreamContainer>::Convert(const extensions::StreamContainer&
(...skipping 18 matching lines...) Expand all
115 result->original_url = info->original_url.spec(); 116 result->original_url = info->original_url.spec();
116 } 117 }
117 118
118 result->stream_url = info->handle->GetURL().spec(); 119 result->stream_url = info->handle->GetURL().spec();
119 result->response_headers = 120 result->response_headers =
120 extensions::CreateResponseHeadersMap(info->response_headers.get()); 121 extensions::CreateResponseHeadersMap(info->response_headers.get());
121 return result; 122 return result;
122 } 123 }
123 124
124 } // namespace mojo 125 } // namespace mojo
OLDNEW
« no previous file with comments | « extensions/browser/api/mime_handler_private/mime_handler_private.h ('k') | extensions/browser/mojo/stash_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698