Migrate HostZoomMap to live in StoragePartition.

chrome/browser/profiles/off_the_record_profile_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 125 matching lines @@
   DataReductionProxyChromeConfigurator::DisableInProxyConfigPref(prefs_);
 
   // TODO(oshima): Remove the need to eagerly initialize the request context
   // getter. chromeos::OnlineAttempt is illegally trying to access this
   // Profile member from a thread other than the UI thread, so we need to
   // prevent a race.
 #if defined(OS_CHROMEOS)
   GetRequestContext();
 #endif  // defined(OS_CHROMEOS)
 
-  InitHostZoomMap();
+  TrackZoomLevelsFromParent();
 
 #if defined(ENABLE_PLUGINS)
   ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
       PluginPrefs::GetForProfile(this).get(),
       io_data_->GetResourceContextNoInit());
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
   // Make the chrome//extension-icon/ resource available.
   extensions::ExtensionIconSource* icon_source =
@@ skipping 35 matching lines @@
 
   // Clears any data the network stack contains that may be related to the
   // OTR session.
   g_browser_process->io_thread()->ChangedToOnTheRecord();
 }
 
 void OffTheRecordProfileImpl::InitIoData() {
   io_data_.reset(new OffTheRecordProfileIOData::Handle(this));
 }
 
-void OffTheRecordProfileImpl::InitHostZoomMap() {
+void OffTheRecordProfileImpl::TrackZoomLevelsFromParent() {
+  DCHECK(profile_->GetProfileType() != INCOGNITO_PROFILE);

[Charlie Reis, 2014/11/04 23:43:16]

DCHECK_NE

[wjmaclean, 2014/11/05 21:55:42]

Done.

+
+  // Here we only want to use zoom levels stored in the main-context's default
+  // storage partition. We're not interested in zoom levels in special
+  // partitions, e.g. those used by WebViewGuests.
   HostZoomMap* host_zoom_map = HostZoomMap::GetDefaultForBrowserContext(this);
   HostZoomMap* parent_host_zoom_map =
       HostZoomMap::GetDefaultForBrowserContext(profile_);
   host_zoom_map->CopyFrom(parent_host_zoom_map);
-  // Observe parent's HZM change for propagating change of parent's
-  // change to this HZM.
-  zoom_subscription_ = parent_host_zoom_map->AddZoomLevelChangedCallback(
-      base::Bind(&OffTheRecordProfileImpl::OnZoomLevelChanged,
+  // Observe parent profile's HostZoomMap changes so they can also be applied
+  // to this profile's HostZoomMap.
+  // Important: this function should never be made virtual without moving the

[Charlie Reis, 2014/11/04 23:43:16]

I don't fully understand this comment, but it also sounds like it belongs in the
.h file, not buried in the body.

[wjmaclean, 2014/11/05 21:55:42]

Actually, I'm removing it ... it used to apply when this code was living in
profile.h, but it is now stale.

+  // subscription down to the leaf nodes(s).

[Charlie Reis, 2014/11/04 23:43:16]

nit: node(s)

(I think.  Node is an unusual term for an overridden method.  Is this suggesting
there may be a full tree of profiles, with children of incognito profiles?)

[wjmaclean, 2014/11/05 21:55:42]

Acknowledged.

+  track_zoom_subscription_ = parent_host_zoom_map->AddZoomLevelChangedCallback(
+      base::Bind(&OffTheRecordProfileImpl::TrackParentZoomLevelChanged,
                  base::Unretained(this)));
 }
 
 std::string OffTheRecordProfileImpl::GetProfileName() {
   // Incognito profile should not return the profile name.
   return std::string();
 }
 
 Profile::ProfileType OffTheRecordProfileImpl::GetProfileType() const {
   return INCOGNITO_PROFILE;
@@ skipping 282 matching lines @@
 #if defined(OS_CHROMEOS)
   if (IsGuestSession())
     profile = new GuestSessionProfile(this);
 #endif
   if (!profile)
     profile = new OffTheRecordProfileImpl(this);
   profile->Init();
   return profile;
 }
 
-void OffTheRecordProfileImpl::OnZoomLevelChanged(
+void OffTheRecordProfileImpl::TrackParentZoomLevelChanged(
     const HostZoomMap::ZoomLevelChange& change) {
   HostZoomMap* host_zoom_map = HostZoomMap::GetDefaultForBrowserContext(this);
   switch (change.mode) {
     case HostZoomMap::ZOOM_CHANGED_TEMPORARY_ZOOM:
        return;
     case HostZoomMap::ZOOM_CHANGED_FOR_HOST:
        host_zoom_map->SetZoomLevelForHost(change.host, change.zoom_level);
        return;
     case HostZoomMap::ZOOM_CHANGED_FOR_SCHEME_AND_HOST:
        host_zoom_map->SetZoomLevelForHostAndScheme(change.scheme,
            change.host,
            change.zoom_level);
        return;
   }
 }
 
 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
 #if defined(OS_CHROMEOS)
   if (chromeos::ProfileHelper::IsSigninProfile(this)) {
     return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
         g_browser_process->local_state());
   }
 #endif  // defined(OS_CHROMEOS)
   return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
       GetPrefs(), g_browser_process->local_state());
 }