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

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.cc

Issue 11093080: <webview>: First stab at implementing media permission request for guests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use correct base for upload. Created 8 years, 2 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: content/browser/browser_plugin/browser_plugin_guest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index d470801eb6667279c79734097e1488e0357222c4..e4ae58d345127fea7d72300f798d341d0b3a80b3 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -20,6 +20,7 @@
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/resource_request_details.h"
#include "content/public/browser/user_metrics.h"
+#include "content/public/common/media_stream_request.h"
#include "content/public/common/result_codes.h"
#include "content/browser/browser_plugin/browser_plugin_host_factory.h"
#include "net/base/net_errors.h"
@@ -131,6 +132,20 @@ void BrowserPluginGuest::RendererUnresponsive(WebContents* source) {
RecordAction(UserMetricsAction("BrowserPlugin.Guest.Hung"));
}
+void BrowserPluginGuest::RequestMediaAccessPermission(
+ WebContents* web_contents,
+ const content::MediaStreamRequest* request,
+ const content::MediaResponseCallback& callback) {
+ static int request_count = 0;
+ int request_id = request_count++;
+ media_requests_map_.insert(
+ std::make_pair(request_id,
+ std::make_pair(*request, callback)));
+
+ SendMessageToEmbedder(new BrowserPluginMsg_RequestMediaAccess(instance_id(),
+ request_id));
+}
+
void BrowserPluginGuest::SetIsAcceptingTouchEvents(bool accept) {
SendMessageToEmbedder(
new BrowserPluginMsg_ShouldAcceptTouchEvents(instance_id(), accept));
@@ -155,6 +170,33 @@ void BrowserPluginGuest::Terminate() {
base::KillProcess(process_handle, RESULT_CODE_KILLED, false);
}
+void BrowserPluginGuest::AllowMediaAccess(WebContents* embedder_web_contents,
+ int request_id,
+ bool allow) {
+ MediaStreamRequestsMap::iterator media_request_iter =
+ media_requests_map_.find(request_id);
+ if (media_request_iter == media_requests_map_.end()) {
+ LOG(INFO) << "Not a valid request id";
+ return;
+ }
+ const content::MediaStreamRequest& request = media_request_iter->second.first;
+ const content::MediaResponseCallback& callback =
+ media_request_iter->second.second;
+
+ if (allow) {
+ WebContentsImpl* embedder_web_contents_impl = static_cast<
+ WebContentsImpl*>(embedder_web_contents);
+ // Re-route the request to the embedder's WebContents, the guest gets the
+ // permission this way.
+ embedder_web_contents_impl->RequestMediaAccessPermission(
+ &request, callback);
+ } else {
+ // Deny the request.
+ callback.Run(content::MediaStreamDevices());
+ }
+ media_requests_map_.erase(media_request_iter);
+}
+
void BrowserPluginGuest::SetDamageBuffer(
TransportDIB* damage_buffer,
#if defined(OS_WIN)

Powered by Google App Engine
This is Rietveld 408576698