commit caa7d6d94e81c92083a3eb8d18913e33c74baf66
author wjmaclean <wjmaclean@chromium.org> Wed Nov 12 16:42:11 2014
committer Commit bot <commit-bot@chromium.org> Wed Nov 12 16:42:27 2014
tree af7a8d058b5de890314e4fbf861ab769e3b73b2e
parent a7fda04bfe6b643227baf95c9f6e2450cc5daf56

Migrate HostZoomMap to live in StoragePartition.

This CL changes the persistence of host zoom levels to be on
a per-storage-partition basis, as opposed to (the current)
per-profile basis. This is needed to allow WebView content
(withing apps) to keep their zoom levels independent of those
in the main browser window.

BUG=335317

Review URL: https://codereview.chromium.org/393133002

Cr-Commit-Position: refs/heads/master@{#303841}

content/browser/storage_partition_impl.h

diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h
index 3037739..bde83ad 100644
--- a/content/browser/storage_partition_impl.h
+++ b/content/browser/storage_partition_impl.h
@@ -10,6 +10,7 @@
 #include "base/memory/ref_counted.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
+#include "content/browser/host_zoom_level_context.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/media/webrtc_identity_store.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
@@ -44,6 +45,9 @@
   IndexedDBContextImpl* GetIndexedDBContext() override;
   ServiceWorkerContextWrapper* GetServiceWorkerContext() override;
   GeofencingManager* GetGeofencingManager() override;
+  HostZoomMap* GetHostZoomMap() override;
+  HostZoomLevelContext* GetHostZoomLevelContext() override;
+  ZoomLevelDelegate* GetZoomLevelDelegate() override;
 
   void ClearDataForOrigin(uint32 remove_mask,
                           uint32 quota_storage_remove_mask,
@@ -118,7 +122,8 @@
       ServiceWorkerContextWrapper* service_worker_context,
       WebRTCIdentityStore* webrtc_identity_store,
       storage::SpecialStoragePolicy* special_storage_policy,
-      GeofencingManager* geofencing_manager);
+      GeofencingManager* geofencing_manager,
+      HostZoomLevelContext* host_zoom_level_context);
 
   void ClearDataImpl(uint32 remove_mask,
                      uint32 quota_storage_remove_mask,
@@ -159,6 +164,7 @@
   scoped_refptr<WebRTCIdentityStore> webrtc_identity_store_;
   scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<GeofencingManager> geofencing_manager_;
+  scoped_refptr<HostZoomLevelContext> host_zoom_level_context_;
 
   DISALLOW_COPY_AND_ASSIGN(StoragePartitionImpl);
 };