OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/extensions/api/streams_private/streams_private_api.h" | 5 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h" |
6 | 6 |
7 #include <limits.h> | 7 #include <limits.h> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
10 #include "base/values.h" | 11 #include "base/values.h" |
11 #include "chrome/browser/extensions/extension_tab_util.h" | 12 #include "chrome/browser/extensions/extension_tab_util.h" |
12 #include "chrome/common/extensions/api/streams_private.h" | 13 #include "chrome/common/extensions/api/streams_private.h" |
13 #include "content/public/browser/stream_handle.h" | 14 #include "content/public/browser/stream_handle.h" |
14 #include "content/public/browser/stream_info.h" | 15 #include "content/public/browser/stream_info.h" |
15 #include "extensions/browser/event_router.h" | 16 #include "extensions/browser/event_router.h" |
16 #include "extensions/browser/extension_function_registry.h" | 17 #include "extensions/browser/extension_function_registry.h" |
17 #include "extensions/browser/extension_registry.h" | 18 #include "extensions/browser/extension_registry.h" |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 | 80 |
80 MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension); | 81 MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension); |
81 // If the mime handler uses MimeHandlerViewGuest, the MimeHandlerViewGuest | 82 // If the mime handler uses MimeHandlerViewGuest, the MimeHandlerViewGuest |
82 // will take ownership of the stream. Otherwise, store the stream handle in | 83 // will take ownership of the stream. Otherwise, store the stream handle in |
83 // |streams_| and fire an event notifying the extension. | 84 // |streams_| and fire an event notifying the extension. |
84 if (handler->HasPlugin()) { | 85 if (handler->HasPlugin()) { |
85 GURL handler_url(Extension::GetBaseURLFromExtensionId(extension_id).spec() + | 86 GURL handler_url(Extension::GetBaseURLFromExtensionId(extension_id).spec() + |
86 handler->handler_url()); | 87 handler->handler_url()); |
87 auto tab_id = ExtensionTabUtil::GetTabId(web_contents); | 88 auto tab_id = ExtensionTabUtil::GetTabId(web_contents); |
88 scoped_ptr<StreamContainer> stream_container(new StreamContainer( | 89 scoped_ptr<StreamContainer> stream_container(new StreamContainer( |
89 stream.Pass(), tab_id, embedded, handler_url, extension_id)); | 90 std::move(stream), tab_id, embedded, handler_url, extension_id)); |
90 MimeHandlerStreamManager::Get(browser_context_) | 91 MimeHandlerStreamManager::Get(browser_context_) |
91 ->AddStream(view_id, stream_container.Pass(), render_process_id, | 92 ->AddStream(view_id, std::move(stream_container), render_process_id, |
92 render_frame_id); | 93 render_frame_id); |
93 return; | 94 return; |
94 } | 95 } |
95 // Create the event's arguments value. | 96 // Create the event's arguments value. |
96 streams_private::StreamInfo info; | 97 streams_private::StreamInfo info; |
97 info.mime_type = stream->mime_type; | 98 info.mime_type = stream->mime_type; |
98 info.original_url = stream->original_url.spec(); | 99 info.original_url = stream->original_url.spec(); |
99 info.stream_url = stream->handle->GetURL().spec(); | 100 info.stream_url = stream->handle->GetURL().spec(); |
100 info.tab_id = ExtensionTabUtil::GetTabId(web_contents); | 101 info.tab_id = ExtensionTabUtil::GetTabId(web_contents); |
101 info.embedded = embedded; | 102 info.embedded = embedded; |
102 | 103 |
103 if (!view_id.empty()) { | 104 if (!view_id.empty()) { |
104 info.view_id.reset(new std::string(view_id)); | 105 info.view_id.reset(new std::string(view_id)); |
105 } | 106 } |
106 | 107 |
107 int size = -1; | 108 int size = -1; |
108 if (expected_content_size <= INT_MAX) | 109 if (expected_content_size <= INT_MAX) |
109 size = expected_content_size; | 110 size = expected_content_size; |
110 info.expected_content_size = size; | 111 info.expected_content_size = size; |
111 | 112 |
112 CreateResponseHeadersDictionary(stream->response_headers.get(), | 113 CreateResponseHeadersDictionary(stream->response_headers.get(), |
113 &info.response_headers.additional_properties); | 114 &info.response_headers.additional_properties); |
114 | 115 |
115 scoped_ptr<Event> event( | 116 scoped_ptr<Event> event( |
116 new Event(events::STREAMS_PRIVATE_ON_EXECUTE_MIME_TYPE_HANDLER, | 117 new Event(events::STREAMS_PRIVATE_ON_EXECUTE_MIME_TYPE_HANDLER, |
117 streams_private::OnExecuteMimeTypeHandler::kEventName, | 118 streams_private::OnExecuteMimeTypeHandler::kEventName, |
118 streams_private::OnExecuteMimeTypeHandler::Create(info))); | 119 streams_private::OnExecuteMimeTypeHandler::Create(info))); |
119 | 120 |
120 EventRouter::Get(browser_context_) | 121 EventRouter::Get(browser_context_) |
121 ->DispatchEventToExtension(extension_id, event.Pass()); | 122 ->DispatchEventToExtension(extension_id, std::move(event)); |
122 | 123 |
123 GURL url = stream->handle->GetURL(); | 124 GURL url = stream->handle->GetURL(); |
124 streams_[extension_id][url] = make_linked_ptr(stream->handle.release()); | 125 streams_[extension_id][url] = make_linked_ptr(stream->handle.release()); |
125 } | 126 } |
126 | 127 |
127 void StreamsPrivateAPI::AbortStream(const std::string& extension_id, | 128 void StreamsPrivateAPI::AbortStream(const std::string& extension_id, |
128 const GURL& stream_url, | 129 const GURL& stream_url, |
129 const base::Closure& callback) { | 130 const base::Closure& callback) { |
130 StreamMap::iterator extension_it = streams_.find(extension_id); | 131 StreamMap::iterator extension_it = streams_.find(extension_id); |
131 if (extension_it == streams_.end()) { | 132 if (extension_it == streams_.end()) { |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 static base::LazyInstance<BrowserContextKeyedAPIFactory<StreamsPrivateAPI> > | 172 static base::LazyInstance<BrowserContextKeyedAPIFactory<StreamsPrivateAPI> > |
172 g_factory = LAZY_INSTANCE_INITIALIZER; | 173 g_factory = LAZY_INSTANCE_INITIALIZER; |
173 | 174 |
174 // static | 175 // static |
175 BrowserContextKeyedAPIFactory<StreamsPrivateAPI>* | 176 BrowserContextKeyedAPIFactory<StreamsPrivateAPI>* |
176 StreamsPrivateAPI::GetFactoryInstance() { | 177 StreamsPrivateAPI::GetFactoryInstance() { |
177 return g_factory.Pointer(); | 178 return g_factory.Pointer(); |
178 } | 179 } |
179 | 180 |
180 } // namespace extensions | 181 } // namespace extensions |
OLD | NEW |