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

Unified Diff: chrome/browser/renderer_host/chrome_render_message_filter.cc

Issue 8312005: Ignore paths when matching patterns for extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 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
« no previous file with comments | « chrome/browser/renderer_host/chrome_render_message_filter.h ('k') | chrome/common/extensions/url_pattern.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « chrome/browser/renderer_host/chrome_render_message_filter.h ('k') | chrome/common/extensions/url_pattern.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698