| Index: content/renderer/browser_plugin/browser_plugin.cc
|
| diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
|
| index a2c0ed0a5ea10bd3e55e91d59f33a5780092191c..431f3466f19d99bcdb955a02936fc2cd7c6af182 100644
|
| --- a/content/renderer/browser_plugin/browser_plugin.cc
|
| +++ b/content/renderer/browser_plugin/browser_plugin.cc
|
| @@ -26,8 +26,8 @@
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
|
| +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
|
| #include "webkit/plugins/sad_plugin.h"
|
|
|
| #if defined (OS_WIN)
|
| @@ -53,6 +53,7 @@ const char kEventLoadCommit[] = "loadcommit";
|
| const char kEventLoadRedirect[] = "loadredirect";
|
| const char kEventLoadStart[] = "loadstart";
|
| const char kEventLoadStop[] = "loadstop";
|
| +const char kEventRequestPermission[] = "permissionrequest";
|
| const char kEventSizeChanged[] = "sizechanged";
|
|
|
| // Parameters/properties on events.
|
| @@ -64,10 +65,12 @@ const char kOldURL[] = "oldUrl";
|
| const char kOldHeight[] = "oldHeight";
|
| const char kOldWidth[] = "oldWidth";
|
| const char kPartition[] = "partition";
|
| +const char kPermissionTypeMedia[] = "media";
|
| const char kPersistPrefix[] = "persist:";
|
| const char kProcessId[] = "processId";
|
| -const char kSrc[] = "src";
|
| const char kReason[] = "reason";
|
| +const char kRequestId[] = "request_id";
|
| +const char kSrc[] = "src";
|
| const char kURL[] = "url";
|
|
|
| // Error messages.
|
| @@ -640,6 +643,13 @@ void BrowserPlugin::LoadAbort(const GURL& url,
|
| TriggerEvent(kEventLoadAbort, &props);
|
| }
|
|
|
| +void BrowserPlugin::RequestMediaAccess(int request_id) {
|
| + std::map<std::string, base::Value*> props;
|
| + props[kReason] = base::Value::CreateStringValue(kPermissionTypeMedia);
|
| + props[kRequestId] = base::Value::CreateIntegerValue(request_id);
|
| + TriggerEvent(kEventRequestPermission, &props);
|
| +}
|
| +
|
| void BrowserPlugin::LoadRedirect(const GURL& old_url,
|
| const GURL& new_url,
|
| bool is_top_level) {
|
| @@ -693,6 +703,14 @@ void BrowserPlugin::SetAcceptTouchEvents(bool accept) {
|
| }
|
| }
|
|
|
| +void BrowserPlugin::RespondMediaAccess(int request_id, bool allow) {
|
| + browser_plugin_manager()->Send(
|
| + new BrowserPluginHostMsg_AllowMediaAccess(render_view_->GetRoutingID(),
|
| + instance_id_,
|
| + request_id,
|
| + allow));
|
| +}
|
| +
|
| WebKit::WebPluginContainer* BrowserPlugin::container() const {
|
| return container_;
|
| }
|
|
|