summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 21:57:53 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 21:57:53 +0000
commit4361c7ca9c1a850f3c075612bd0e20630b821355 (patch)
tree98b7e5e2f1a4923a4d2df5d97620d8abfd29d4a5 /chrome/browser/renderer_host
parent9fabbf77b5b467003287b055aece906a4330de86 (diff)
downloadchromium_src-4361c7ca9c1a850f3c075612bd0e20630b821355.zip
chromium_src-4361c7ca9c1a850f3c075612bd0e20630b821355.tar.gz
chromium_src-4361c7ca9c1a850f3c075612bd0e20630b821355.tar.bz2
Refactor ChromeURLRequestContext to pull out ExtensionInfoMap into a shared
data structure that all the different contexts have a handle to. BUG=56558 TEST=no functional change Review URL: http://codereview.chromium.org/3439017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/resource_message_filter.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 1bfe307..272fc55 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -986,8 +986,8 @@ void ResourceMessageFilter::OnCheckNotificationPermission(
*result = WebKit::WebNotificationPresenter::PermissionNotAllowed;
ChromeURLRequestContext* context = GetRequestContextForURL(source_url);
- if (context->CheckURLAccessToExtensionPermission(source_url,
- Extension::kNotificationPermission)) {
+ if (context->extension_info_map()->CheckURLAccessToExtensionPermission(
+ source_url, Extension::kNotificationPermission)) {
*result = WebKit::WebNotificationPresenter::PermissionAllowed;
return;
}
@@ -1653,9 +1653,10 @@ void ResourceMessageFilter::OnGetExtensionMessageBundle(
ChromeURLRequestContext* context = static_cast<ChromeURLRequestContext*>(
request_context_->GetURLRequestContext());
- FilePath extension_path = context->GetPathForExtension(extension_id);
+ FilePath extension_path =
+ context->extension_info_map()->GetPathForExtension(extension_id);
std::string default_locale =
- context->GetDefaultLocaleForExtension(extension_id);
+ context->extension_info_map()->GetDefaultLocaleForExtension(extension_id);
ChromeThread::PostTask(
ChromeThread::FILE, FROM_HERE,