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

Unified Diff: extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc

Issue 797183005: Add a mimeHandler extension API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@streams-lifetime
Patch Set: rebase Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
index 009932e66d159cda2c009a6edbd6968a513c151b..c9d55cfcf8009a2e413eddbe9443f1d4275309cc 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -9,8 +9,10 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/stream_handle.h"
#include "content/public/browser/stream_info.h"
+#include "content/public/common/service_registry.h"
#include "content/public/common/url_constants.h"
#include "extensions/browser/api/extensions_api_client.h"
+#include "extensions/browser/api/mime_handler_private/mime_handler_private.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h"
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_constants.h"
@@ -27,9 +29,13 @@ using content::WebContents;
namespace extensions {
StreamContainer::StreamContainer(scoped_ptr<content::StreamInfo> stream,
+ int tab_id,
+ bool embedded,
const GURL& handler_url,
const std::string& extension_id)
: stream_(stream.Pass()),
+ embedded_(embedded),
+ tab_id_(tab_id),
handler_url_(handler_url),
extension_id_(extension_id),
weak_factory_(this) {
@@ -38,7 +44,12 @@ StreamContainer::StreamContainer(scoped_ptr<content::StreamInfo> stream,
StreamContainer::~StreamContainer() {
}
-void StreamContainer::Abort() {
+void StreamContainer::Abort(const base::Closure& callback) {
+ if (!stream_) {
+ callback.Run();
+ return;
+ }
+ stream_->handle->AddCloseListener(callback);
stream_->handle.reset();
}
@@ -126,6 +137,8 @@ void MimeHandlerViewGuest::DidAttachToEmbedder() {
web_contents()->GetController().LoadURL(
stream_->handler_url(), content::Referrer(),
ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
+ web_contents()->GetMainFrame()->GetServiceRegistry()->AddService(
+ base::Bind(&MimeHandlerServiceImpl::Create, stream_->GetWeakPtr()));
}
void MimeHandlerViewGuest::DidInitialize(
« no previous file with comments | « extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h ('k') | extensions/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698