content: convert zoom notifications to observer usage

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 304 matching lines @@
   prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit,
                              false,
                              PrefServiceSyncable::SYNCABLE_PREF);
 }
 
 ProfileImpl::ProfileImpl(
     const FilePath& path,
     Delegate* delegate,
     CreateMode create_mode,
     base::SequencedTaskRunner* sequenced_task_runner)
-    : path_(path),
+    : zoom_callback_(base::Bind(&ProfileImpl::OnZoomLevelChanged,
+                                base::Unretained(this))),
+      path_(path),
       ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
       host_content_settings_map_(NULL),
       last_session_exit_type_(EXIT_NORMAL),
       start_time_(Time::Now()),
       delegate_(delegate),
       predictor_(NULL) {
   DCHECK(!path.empty()) << "Using an empty path will attempt to write " <<
                             "profile files to the root directory!";
 
 #if defined(ENABLE_SESSION_SERVICE)
@@ skipping 224 matching lines @@
       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);
     }
   }
 
-  registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
-                 content::Source<HostZoomMap>(host_zoom_map));
+  host_zoom_map->AddZoomLevelChangedCallback(zoom_callback_);
 }
 
 FilePath ProfileImpl::last_selected_directory() {
   return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory);
 }
 
 void ProfileImpl::set_last_selected_directory(const FilePath& path) {
   GetPrefs()->SetFilePath(prefs::kSelectFileLastDirectory, path);
 }
 
 ProfileImpl::~ProfileImpl() {
   MaybeSendDestroyedNotification();
 
+  HostZoomMap::GetForBrowserContext(this)->RemoveZoomLevelChangedCallback(
+      zoom_callback_);
+
   bool prefs_loaded = prefs_->GetInitializationStatus() !=
       PrefService::INITIALIZATION_STATUS_WAITING;
 
 #if defined(ENABLE_SESSION_SERVICE)
   StopCreateSessionServiceTimer();
 #endif
 
   // Remove pref observers
   pref_change_registrar_.RemoveAll();
 
@@ skipping 328 matching lines @@
 void ProfileImpl::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED:
       // Causes lazy-load if sync is enabled.
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(this);
       registrar_.Remove(this, chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED,
                         content::Source<Profile>(this));
       break;
-    case content::NOTIFICATION_ZOOM_LEVEL_CHANGED: {
-      const std::string& host =
-          *(content::Details<const std::string>(details).ptr());
-      if (!host.empty()) {
-        HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
-        double level = host_zoom_map->GetZoomLevel(host);
-        DictionaryPrefUpdate update(prefs_.get(), prefs::kPerHostZoomLevels);
-        DictionaryValue* host_zoom_dictionary = update.Get();
-        if (level == host_zoom_map->GetDefaultZoomLevel()) {
-          host_zoom_dictionary->RemoveWithoutPathExpansion(host, NULL);
-        } else {
-          host_zoom_dictionary->SetWithoutPathExpansion(
-              host, Value::CreateDoubleValue(level));
-        }
-      }
-      break;
-    }
     default:
       NOTREACHED();
   }
 }
 
 void ProfileImpl::OnDefaultZoomLevelChanged() {
   HostZoomMap::GetForBrowserContext(this)->SetDefaultZoomLevel(
       pref_change_registrar_.prefs()->GetDouble(prefs::kDefaultZoomLevel));
 }
 
+void ProfileImpl::OnZoomLevelChanged(const std::string& host) {
+  if (host.empty())
+    return;
+  HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
+  double level = host_zoom_map->GetZoomLevel(host);
+  DictionaryPrefUpdate update(prefs_.get(), prefs::kPerHostZoomLevels);
+  DictionaryValue* host_zoom_dictionary = update.Get();
+  if (level == host_zoom_map->GetDefaultZoomLevel()) {
+    host_zoom_dictionary->RemoveWithoutPathExpansion(host, NULL);
+  } else {
+    host_zoom_dictionary->SetWithoutPathExpansion(
+        host, Value::CreateDoubleValue(level));
+  }
+}
+
 #if defined(ENABLE_SESSION_SERVICE)
 void ProfileImpl::StopCreateSessionServiceTimer() {
   create_session_service_timer_.Stop();
 }
 
 void ProfileImpl::EnsureSessionServiceCreated() {
   SessionServiceFactory::GetForProfile(this);
 }
 #endif
 
@@ skipping 177 matching lines @@
                                      FilePath* cache_path,
                                      int* max_size) {
   DCHECK(cache_path);
   DCHECK(max_size);
   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);
 }