Remove Profile code from HostZoomMap.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2011 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/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 34 matching lines @@
 #include "chrome/browser/net/net_pref_observer.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/password_manager/password_store_default.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_value_store.h"
+#include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/spellcheck_host.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
 #include "chrome/browser/status_icons/status_tray.h"
@@ skipping 875 matching lines @@
 }
 
 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
   if (!host_content_settings_map_.get())
     host_content_settings_map_ = new HostContentSettingsMap(this);
   return host_content_settings_map_.get();
 }
 
 HostZoomMap* ProfileImpl::GetHostZoomMap() {
   if (!host_zoom_map_) {
-    host_zoom_map_ = new HostZoomMap(this);
+    host_zoom_map_ = new HostZoomMap();
     host_zoom_map_->set_default_zoom_level(
         GetPrefs()->GetDouble(prefs::kDefaultZoomLevel));
+
+    const DictionaryValue* host_zoom_dictionary =
+        prefs_->GetDictionary(prefs::kPerHostZoomLevels);
+    // Careful: The returned value could be NULL if the pref has never been set.
+    if (host_zoom_dictionary != NULL) {
+      for (DictionaryValue::key_iterator i(host_zoom_dictionary->begin_keys());
+           i != host_zoom_dictionary->end_keys(); ++i) {
+        const std::string& host(*i);
+        double zoom_level = 0;
+
+        bool success = host_zoom_dictionary->GetDoubleWithoutPathExpansion(
+            host, &zoom_level);
+        DCHECK(success);
+        host_zoom_map_->SetZoomLevel(GURL(host), zoom_level);
+      }
+    }
+
+    registrar_.Add(this, NotificationType::ZOOM_LEVEL_CHANGED,
+                 Source<HostZoomMap>(host_zoom_map_));
   }
   return host_zoom_map_.get();
 }
 
 GeolocationContentSettingsMap* ProfileImpl::GetGeolocationContentSettingsMap() {
   if (!geolocation_content_settings_map_.get())
     geolocation_content_settings_map_ = new GeolocationContentSettingsMap(this);
   return geolocation_content_settings_map_.get();
 }
 
@@ skipping 404 matching lines @@
           GetHostZoomMap()->set_default_zoom_level(
               prefs->GetDouble(prefs::kDefaultZoomLevel));
       }
       break;
     }
     case NotificationType::BOOKMARK_MODEL_LOADED:
       GetProfileSyncService();  // Causes lazy-load if sync is enabled.
       registrar_.Remove(this, NotificationType::BOOKMARK_MODEL_LOADED,
                         Source<Profile>(this));
       break;
+    case NotificationType::ZOOM_LEVEL_CHANGED: {
+      const std::string& host = *(Details<const std::string>(details).ptr());
+      if (!host.empty()) {
+        double level = host_zoom_map_->GetZoomLevel(GURL(host));
+        DictionaryPrefUpdate update(prefs_.get(), prefs::kPerHostZoomLevels);
+        DictionaryValue* host_zoom_dictionary = update.Get();
+        if (level == host_zoom_map_->default_zoom_level()) {
+          host_zoom_dictionary->RemoveWithoutPathExpansion(host, NULL);
+        } else {
+          host_zoom_dictionary->SetWithoutPathExpansion(
+              host, Value::CreateDoubleValue(level));
+        }
+      }
+      break;
+    }
     default:
       NOTREACHED();
   }
 }
 
 void ProfileImpl::StopCreateSessionServiceTimer() {
   create_session_service_timer_.Stop();
 }
 
 void ProfileImpl::EnsureSessionServiceCreated() {
@@ skipping 205 matching lines @@
   return pref_proxy_config_tracker_;
 }
 
 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
   if (!prerender::PrerenderManager::IsPrerenderingPossible())
     return NULL;
   if (!prerender_manager_.get())
     prerender_manager_.reset(new prerender::PrerenderManager(this));
   return prerender_manager_.get();
 }