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

Unified Diff: content/browser/loader/resource_message_filter.cc

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments; patch for landing. Created 6 years, 1 month 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
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..4a20d9ac1df7e00939f248d49c14821263403138 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);
}
+const HostZoomMap* ResourceMessageFilter::GetHostZoomMap() const {
+ if (host_zoom_level_context_.get())
+ return host_zoom_level_context_->GetHostZoomMap();
+ return NULL;
+}
+
base::WeakPtr<ResourceMessageFilter> ResourceMessageFilter::GetWeakPtr() {
return weak_ptr_factory_.GetWeakPtr();
}
« no previous file with comments | « content/browser/loader/resource_message_filter.h ('k') | content/browser/loader/resource_scheduler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698