Add scheme to HostZoomMap

chrome/browser/profiles/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/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 567 matching lines @@
   // 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(host, zoom_level);
+      host_zoom_map->SetZoomLevelForHost(host, zoom_level);
     }
   }
 
   host_zoom_map->AddZoomLevelChangedCallback(zoom_callback_);
 }
 
 base::FilePath ProfileImpl::last_selected_directory() {
   return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory);
 }
 
@@ skipping 351 matching lines @@
 
 history::TopSites* ProfileImpl::GetTopSitesWithoutCreating() {
   return top_sites_;
 }
 
 void ProfileImpl::OnDefaultZoomLevelChanged() {
   HostZoomMap::GetForBrowserContext(this)->SetDefaultZoomLevel(
       pref_change_registrar_.prefs()->GetDouble(prefs::kDefaultZoomLevel));
 }
 
-void ProfileImpl::OnZoomLevelChanged(const std::string& host) {
-  if (host.empty())
+void ProfileImpl::OnZoomLevelChanged(
+    const HostZoomMap::ZoomLevelChange& change) {
+
+  if (change.mode != HostZoomMap::ZOOM_CHANGED_FOR_HOST)
     return;
   HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
-  double level = host_zoom_map->GetZoomLevel(host);
+  double level = change.zoom_level;
   DictionaryPrefUpdate update(prefs_.get(), prefs::kPerHostZoomLevels);
   DictionaryValue* host_zoom_dictionary = update.Get();
   if (level == host_zoom_map->GetDefaultZoomLevel()) {
-    host_zoom_dictionary->RemoveWithoutPathExpansion(host, NULL);
+    host_zoom_dictionary->RemoveWithoutPathExpansion(change.host, NULL);
   } else {
     host_zoom_dictionary->SetWithoutPathExpansion(
-        host, Value::CreateDoubleValue(level));
+        change.host, Value::CreateDoubleValue(level));
   }
 }
 
 #if defined(ENABLE_SESSION_SERVICE)
 void ProfileImpl::StopCreateSessionServiceTimer() {
   create_session_service_timer_.Stop();
 }
 
 void ProfileImpl::EnsureSessionServiceCreated() {
   SessionServiceFactory::GetForProfile(this);
@@ skipping 180 matching lines @@
                                      base::FilePath* cache_path,
                                      int* max_size) {
   DCHECK(cache_path);
   DCHECK(max_size);
   base::FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir));
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }