| Index: chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| index a00d31ec91438e2bd3a983e9b10f179acee4134c..73a0cd8752acdcb97a2db0ff22c55337a56c148f 100644
|
| --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| @@ -607,23 +607,19 @@ void ChromeRenderMessageFilter::GetPluginInfo(
|
| status->value = ChromeViewHostMsg_GetPluginInfo_Status::kAllowed;
|
| }
|
|
|
| -void ChromeRenderMessageFilter::OnCanTriggerClipboardRead(const GURL& url,
|
| - bool* allowed) {
|
| - const Extension* extension =
|
| - extension_info_map_->extensions().GetByURL(url);
|
| - *allowed = extension &&
|
| - extension->HasAPIPermission(ExtensionAPIPermission::kClipboardRead);
|
| +void ChromeRenderMessageFilter::OnCanTriggerClipboardRead(
|
| + const GURL& origin, bool* allowed) {
|
| + *allowed = extension_info_map_->SecurityOriginHasAPIPermission(
|
| + origin, render_process_id_, ExtensionAPIPermission::kClipboardRead);
|
| }
|
|
|
| -void ChromeRenderMessageFilter::OnCanTriggerClipboardWrite(const GURL& url,
|
| - bool* allowed) {
|
| +void ChromeRenderMessageFilter::OnCanTriggerClipboardWrite(
|
| + const GURL& origin, bool* allowed) {
|
| // Since all extensions could historically write to the clipboard, preserve it
|
| // for compatibility.
|
| - const Extension* extension =
|
| - extension_info_map_->extensions().GetByURL(url);
|
| - *allowed = url.SchemeIs(chrome::kExtensionScheme) ||
|
| - (extension &&
|
| - extension->HasAPIPermission(ExtensionAPIPermission::kClipboardWrite));
|
| + *allowed = (origin.SchemeIs(chrome::kExtensionScheme) ||
|
| + extension_info_map_->SecurityOriginHasAPIPermission(
|
| + origin, render_process_id_, ExtensionAPIPermission::kClipboardWrite));
|
| }
|
|
|
| void ChromeRenderMessageFilter::OnGetCookies(
|
|
|