Send content settings based on the URL to the renderer instead of just the host.

chrome/browser/host_zoom_map.cc

 // Copyright (c) 2010 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/host_zoom_map.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/scoped_pref_update.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
+#include "googleurl/src/gurl.h"
+#include "net/base/net_util.h"
 
 HostZoomMap::HostZoomMap(Profile* profile)
     : profile_(profile),
       updating_preferences_(false) {
   Load();
   registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
                  Source<Profile>(profile));
   profile_->GetPrefs()->AddPrefObserver(prefs::kPerHostZoomLevels, this);
 }
 
@@ skipping 17 matching lines @@
       host_zoom_levels_[WideToUTF8(wide_host)] = zoom_level;
     }
   }
 }
 
 // static
 void HostZoomMap::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kPerHostZoomLevels);
 }
 
-int HostZoomMap::GetZoomLevel(const std::string& host) const {
+int HostZoomMap::GetZoomLevel(const GURL& url) const {
+  std::string host(net::GetHostOrSpecFromURL(url));
   AutoLock auto_lock(lock_);
   HostZoomLevels::const_iterator i(host_zoom_levels_.find(host));
   return (i == host_zoom_levels_.end()) ? 0 : i->second;
 }
 
-void HostZoomMap::SetZoomLevel(const std::string& host, int level) {
+void HostZoomMap::SetZoomLevel(const GURL& url, int level) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   if (!profile_)
     return;
 
-  if (host.empty())
-    return;
+  std::string host(net::GetHostOrSpecFromURL(url));
 
   {
     AutoLock auto_lock(lock_);
     if (level == 0)
       host_zoom_levels_.erase(host);
     else
       host_zoom_levels_[host] = level;
   }
 
   updating_preferences_ = true;
@@ skipping 62 matching lines @@
       return;
     }
   }
 
   NOTREACHED() << "Unexpected preference observed.";
 }
 
 HostZoomMap::~HostZoomMap() {
   Shutdown();
 }