Chromium Code Reviews| Index: content/browser/loader/resource_message_filter.cc |
| diff --git a/content/browser/loader/resource_message_filter.cc b/content/browser/loader/resource_message_filter.cc |
| index 9ffa29f5716352a8ae1068c6a521a0aa6dab7090..525ea07a70a2a8389d769606e2fc3d8df7b8b38e 100644 |
| --- a/content/browser/loader/resource_message_filter.cc |
| +++ b/content/browser/loader/resource_message_filter.cc |
| @@ -6,6 +6,7 @@ |
| #include "content/browser/appcache/chrome_appcache_service.h" |
| #include "content/browser/fileapi/chrome_blob_storage_context.h" |
| +#include "content/browser/host_zoom_level_context.h" |
| #include "content/browser/loader/resource_dispatcher_host_impl.h" |
| #include "content/browser/service_worker/service_worker_context_wrapper.h" |
| #include "content/common/resource_messages.h" |
| @@ -21,6 +22,7 @@ ResourceMessageFilter::ResourceMessageFilter( |
| ChromeBlobStorageContext* blob_storage_context, |
| storage::FileSystemContext* file_system_context, |
| ServiceWorkerContextWrapper* service_worker_context, |
| + HostZoomLevelContext* host_zoom_level_context, |
| const GetContextsCallback& get_contexts_callback) |
| : BrowserMessageFilter(ResourceMsgStart), |
| child_id_(child_id), |
| @@ -29,6 +31,7 @@ ResourceMessageFilter::ResourceMessageFilter( |
| blob_storage_context_(blob_storage_context), |
| file_system_context_(file_system_context), |
| service_worker_context_(service_worker_context), |
| + host_zoom_level_context_(host_zoom_level_context), |
| get_contexts_callback_(get_contexts_callback), |
| weak_ptr_factory_(this) { |
| } |
| @@ -53,6 +56,12 @@ void ResourceMessageFilter::GetContexts( |
| return get_contexts_callback_.Run(request, resource_context, request_context); |
| } |
| +HostZoomMap* ResourceMessageFilter::GetHostZoomMap() const { |
|
Fady Samuel
2014/11/03 18:57:45
const HostZoomMap*
wjmaclean
2014/11/03 21:53:59
Done.
|
| + if (host_zoom_level_context_.get()) |
| + return host_zoom_level_context_->GetHostZoomMap(); |
| + return NULL; |
| +} |
| + |
| base::WeakPtr<ResourceMessageFilter> ResourceMessageFilter::GetWeakPtr() { |
| return weak_ptr_factory_.GetWeakPtr(); |
| } |