Remove Profile code from HostZoomMap.

BUG=76788
Review URL: http://codereview.chromium.org/7067005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86367 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/profiles/profile.cc

@@ -484,7 +484,7 @@ class OffTheRecordProfileImpl : public Profile,
 
   virtual HostZoomMap* GetHostZoomMap() {
     if (!host_zoom_map_)
-      host_zoom_map_ = new HostZoomMap(this);
+      host_zoom_map_ = new HostZoomMap();
     return host_zoom_map_.get();
   }
 

chrome/browser/profiles/profile_impl.cc

@@ -52,6 +52,7 @@
 #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"
@@ -947,9 +948,28 @@ HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
 
 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();
 }
@@ -1374,6 +1394,21 @@ void ProfileImpl::Observe(NotificationType type,
       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();
   }

chrome/browser/ui/gtk/browser_toolbar_gtk.cc

@@ -223,7 +223,7 @@ void BrowserToolbarGtk::Init(Profile* profile,
 
   wrench_menu_.reset(new MenuGtk(this, &wrench_menu_model_));
   registrar_.Add(this, NotificationType::ZOOM_LEVEL_CHANGED,
-                 Source<Profile>(browser_->profile()));
+      Source<HostZoomMap>(browser_->profile()->GetHostZoomMap()));
 
   if (ShouldOnlyShowLocation()) {
     gtk_widget_show(event_box_);

chrome/browser/ui/toolbar/wrench_menu_model.cc

@@ -230,7 +230,7 @@ WrenchMenuModel::WrenchMenuModel(ui::AcceleratorProvider* provider,
   tabstrip_model_->AddObserver(this);
 
   registrar_.Add(this, NotificationType::ZOOM_LEVEL_CHANGED,
-                 Source<Profile>(browser_->profile()));
+                 Source<HostZoomMap>(browser_->profile()->GetHostZoomMap()));
   registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
                  NotificationService::AllSources());
 }

chrome/browser/ui/views/wrench_menu.cc

@@ -438,8 +438,9 @@ class WrenchMenu::ZoomView : public WrenchMenuView,
 
     UpdateZoomControls();
 
-    registrar_.Add(this, NotificationType::ZOOM_LEVEL_CHANGED,
-                   Source<Profile>(menu->browser_->profile()));
+    registrar_.Add(
+        this, NotificationType::ZOOM_LEVEL_CHANGED,
+        Source<HostZoomMap>(menu->browser_->profile()->GetHostZoomMap()));
   }
 
   gfx::Size GetPreferredSize() {

content/browser/DEPS

@@ -55,7 +55,6 @@ include_rules = [
 
   "+chrome/browser/prefs/pref_change_registrar.h",
   "+chrome/browser/prefs/pref_service.h",
-  "+chrome/browser/prefs/scoped_user_pref_update.h",
   "+chrome/common/pref_names.h",
 
   # http://crbug.com/77090

content/browser/host_zoom_map.cc

@@ -8,10 +8,6 @@
 
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/prefs/scoped_user_pref_update.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ -22,30 +18,10 @@
 
 using WebKit::WebView;
 
-HostZoomMap::HostZoomMap(Profile* profile)
-    : profile_(profile), default_zoom_level_(0.0) {
-
+HostZoomMap::HostZoomMap() : default_zoom_level_(0.0) {
   registrar_.Add(
       this, NotificationType::RENDER_VIEW_HOST_WILL_CLOSE_RENDER_VIEW,
       NotificationService::AllSources());
-
-  base::AutoLock auto_lock(lock_);
-  host_zoom_levels_.clear();
-  const DictionaryValue* host_zoom_dictionary =
-      profile_->GetPrefs()->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_levels_[host] = zoom_level;
-    }
-  }
 }
 
 double HostZoomMap::GetZoomLevel(const GURL& url) const {
@@ -69,22 +45,8 @@ void HostZoomMap::SetZoomLevel(const GURL& url, double level) {
   }
 
   NotificationService::current()->Notify(NotificationType::ZOOM_LEVEL_CHANGED,
-                                         Source<Profile>(profile_),
-                                         NotificationService::NoDetails());
-
-  // If we're in incognito mode, don't persist changes to the prefs.  We'll keep
-  // them in memory only so they will be forgotten on exiting incognito.
-  if (profile_->IsOffTheRecord())
-    return;
-
-  DictionaryPrefUpdate update(profile_->GetPrefs(), prefs::kPerHostZoomLevels);
-  DictionaryValue* host_zoom_dictionary = update.Get();
-  if (level == default_zoom_level_) {
-    host_zoom_dictionary->RemoveWithoutPathExpansion(host, NULL);
-  } else {
-    host_zoom_dictionary->SetWithoutPathExpansion(
-        host, Value::CreateDoubleValue(level));
-  }
+                                         Source<HostZoomMap>(this),
+                                         Details<const std::string>(&host));
 }
 
 double HostZoomMap::GetTemporaryZoomLevel(int render_process_id,
@@ -129,7 +91,7 @@ void HostZoomMap::SetTemporaryZoomLevel(int render_process_id,
   }
 
   NotificationService::current()->Notify(NotificationType::ZOOM_LEVEL_CHANGED,
-                                         Source<Profile>(profile_),
+                                         Source<HostZoomMap>(this),
                                          NotificationService::NoDetails());
 }
 

content/browser/host_zoom_map.h

@@ -21,7 +21,6 @@
 #include "content/common/notification_registrar.h"
 
 class GURL;
-class Profile;
 
 // HostZoomMap needs to be deleted on the UI thread because it listens
 // to notifications on there (and holds a NotificationRegistrar).
@@ -30,7 +29,7 @@ class HostZoomMap :
     public base::RefCountedThreadSafe<HostZoomMap,
                                       BrowserThread::DeleteOnUIThread> {
  public:
-  explicit HostZoomMap(Profile* profile);
+  HostZoomMap();
 
   // Returns the zoom level for a given url. The zoom level is determined by
   // the host portion of the URL, or (in the absence of a host) the complete
@@ -69,6 +68,7 @@ class HostZoomMap :
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
+  double default_zoom_level() const { return default_zoom_level_; }
   void set_default_zoom_level(double level) { default_zoom_level_ = level; }
 
  private:
@@ -79,9 +79,6 @@ class HostZoomMap :
 
   ~HostZoomMap();
 
-  // The profile we're associated with.
-  Profile* profile_;
-
   // Copy of the pref data, so that we can read it on the IO thread.
   HostZoomLevels host_zoom_levels_;
   double default_zoom_level_;

content/browser/renderer_host/render_message_filter.cc

@@ -28,7 +28,6 @@
 #include "content/browser/browser_thread.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/content_browser_client.h"
-#include "content/browser/host_zoom_map.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/ppapi_plugin_process_host.h"
@@ -292,7 +291,6 @@ RenderMessageFilter::RenderMessageFilter(
       notification_prefs_(
           DesktopNotificationServiceFactory::GetForProfile(profile)->
               prefs_cache()),
-      host_zoom_map_(profile->GetHostZoomMap()),
       incognito_(profile->IsOffTheRecord()),
       webkit_context_(profile->GetWebKitContext()),
       render_process_id_(render_process_id) {
@@ -375,7 +373,6 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message,
     IPC_MESSAGE_HANDLER(ViewHostMsg_RevealFolderInOS, OnRevealFolderInOS)
     IPC_MESSAGE_HANDLER(ViewHostMsg_AllocateSharedMemoryBuffer,
                         OnAllocateSharedMemoryBuffer)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_DidZoomURL, OnDidZoomURL)
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(ViewHostMsg_AllocTransportDIB, OnAllocTransportDIB)
     IPC_MESSAGE_HANDLER(ViewHostMsg_FreeTransportDIB, OnFreeTransportDIB)
@@ -674,40 +671,6 @@ void RenderMessageFilter::OnAllocateSharedMemoryBuffer(
   shared_buf.GiveToProcess(peer_handle(), handle);
 }
 
-void RenderMessageFilter::OnDidZoomURL(const IPC::Message& message,
-                                       double zoom_level,
-                                       bool remember,
-                                       const GURL& url) {
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(this,
-          &RenderMessageFilter::UpdateHostZoomLevelsOnUIThread,
-          zoom_level, remember, url, render_process_id_, message.routing_id()));
-}
-
-void RenderMessageFilter::UpdateHostZoomLevelsOnUIThread(
-    double zoom_level,
-    bool remember,
-    const GURL& url,
-    int render_process_id,
-    int render_view_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (remember) {
-    host_zoom_map_->SetZoomLevel(url, zoom_level);
-    // Notify renderers from this profile.
-    for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
-         !i.IsAtEnd(); i.Advance()) {
-      RenderProcessHost* render_process_host = i.GetCurrentValue();
-      if (render_process_host->profile() == profile_) {
-        render_process_host->Send(
-            new ViewMsg_SetZoomLevelForCurrentURL(url, zoom_level));
-      }
-    }
-  } else {
-    host_zoom_map_->SetTemporaryZoomLevel(
-        render_process_id, render_view_id, zoom_level);
-  }
-}
-
 net::URLRequestContext* RenderMessageFilter::GetRequestContextForURL(
     const GURL& url) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

content/browser/renderer_host/render_message_filter.h

@@ -29,7 +29,6 @@
 struct FontDescriptor;
 class ExtensionInfoMap;
 class HostContentSettingsMap;
-class HostZoomMap;
 class NotificationsPrefsCache;
 class Profile;
 class RenderWidgetHelper;
@@ -180,16 +179,6 @@ class RenderMessageFilter : public BrowserMessageFilter {
   // in the renderer on POSIX due to the sandbox.
   void OnAllocateSharedMemoryBuffer(uint32 buffer_size,
                                     base::SharedMemoryHandle* handle);
-  void OnDidZoomURL(const IPC::Message& message,
-                    double zoom_level,
-                    bool remember,
-                    const GURL& url);
-  void UpdateHostZoomLevelsOnUIThread(double zoom_level,
-                                      bool remember,
-                                      const GURL& url,
-                                      int render_process_id,
-                                      int render_view_id);
-
   void OnResolveProxy(const GURL& url, IPC::Message* reply_msg);
 
   // Browser side transport DIB allocation
@@ -254,9 +243,6 @@ class RenderMessageFilter : public BrowserMessageFilter {
   // Desktop Notifications permission messages.
   scoped_refptr<NotificationsPrefsCache> notification_prefs_;
 
-  // Handles zoom-related messages.
-  scoped_refptr<HostZoomMap> host_zoom_map_;
-
   // Whether this process is used for incognito tabs.
   bool incognito_;
 

content/browser/renderer_host/render_view_host.h

@@ -444,6 +444,7 @@ class RenderViewHost : public RenderWidgetHost {
   void OnAccessibilityNotifications(
       const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params);
   void OnScriptEvalResponse(int id, const ListValue& result);
+  void OnDidZoomURL(double zoom_level, bool remember, const GURL& url);
 
 #if defined(OS_MACOSX)
   void OnMsgShowPopup(const ViewHostMsg_ShowPopup_Params& params);

content/common/notification_type.h

@@ -1259,7 +1259,9 @@ class NotificationType {
     BOOKMARK_CONTEXT_MENU_SHOWN,
 #endif
 
-    // Sent when the zoom level changes. The source is the profile.
+    // Sent when the zoom level changes. The source is the HostZoomMap.  The
+    // details is a string of the hostname for which the zoom changed.  In case
+    // of a temporary zoom level change, the details is an empty string.
     ZOOM_LEVEL_CHANGED,
 
     // Sent when the tab's closeable state has changed due to increase/decrease