Index: content/browser/renderer_host/render_message_filter.cc |
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc |
index 42806c0eacf9b9ff8722ad7065058934d8e5358a..93b053c30c64592bcf7a25ad28e46b3e5f38c6f0 100644 |
--- a/content/browser/renderer_host/render_message_filter.cc |
+++ b/content/browser/renderer_host/render_message_filter.cc |
@@ -15,7 +15,6 @@ |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/download/download_types.h" |
#include "chrome/browser/download/download_util.h" |
-#include "chrome/browser/extensions/extension_info_map.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/extensions/extension.h" |
@@ -385,14 +384,11 @@ void RenderMessageFilter::OnMsgCreateWindow( |
int* route_id, int64* cloned_session_storage_namespace_id) { |
// If the opener is trying to create a background window but doesn't have |
jam
2011/06/08 00:18:17
I just realized, BackgroundContents is a chrome co
Matt Perry
2011/06/08 00:33:37
Done.
|
// the appropriate permission, fail the attempt. |
- if (params.window_container_type == WINDOW_CONTAINER_TYPE_BACKGROUND) { |
- const Extension* extension = |
- extension_info_map_->extensions().GetByURL(params.opener_url); |
- if (!extension || |
- !extension->HasApiPermission(Extension::kBackgroundPermission)) { |
- *route_id = MSG_ROUTING_NONE; |
- return; |
- } |
+ if (params.window_container_type == WINDOW_CONTAINER_TYPE_BACKGROUND && |
+ !content::GetContentClient()->browser()-> |
+ CheckBackgroundPermission(params.opener_url, resource_context_)) { |
+ *route_id = MSG_ROUTING_NONE; |
+ return; |
} |
*cloned_session_storage_namespace_id = |