content: convert zoom notifications to observer usage

chrome/browser/profiles/off_the_record_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/off_the_record_profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 26 matching lines @@
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/transport_security_state.h"
 #include "net/http/http_server_properties.h"
 #include "webkit/database/database_tracker.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ skipping 21 matching lines @@
   ExtensionWebRequestEventRouter::GetInstance()->OnOTRProfileDestroyed(
       original_profile, otr_profile);
 }
 
 }  // namespace
 
 OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile)
     : profile_(real_profile),
       prefs_(real_profile->GetOffTheRecordPrefs()),
       ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
-      start_time_(Time::Now()) {
+      start_time_(Time::Now()),
+      zoom_callback_(base::Bind(&OffTheRecordProfileImpl::OnZoomLevelChanged,
+                                base::Unretained(this))) {
 }
 
 void OffTheRecordProfileImpl::Init() {
   ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false);
 
   extensions::ExtensionSystem::Get(this)->InitForOTRProfile();
 
   DCHECK_NE(IncognitoModePrefs::DISABLED,
             IncognitoModePrefs::GetAvailability(profile_->GetPrefs()));
 
@@ skipping 21 matching lines @@
 #endif
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&NotifyOTRProfileCreatedOnIOThread, profile_, this));
 }
 
 OffTheRecordProfileImpl::~OffTheRecordProfileImpl() {
   MaybeSendDestroyedNotification();
 
+  HostZoomMap::GetForBrowserContext(profile_)->RemoveZoomLevelChangedCallback(
+      zoom_callback_);
+
 #if defined(ENABLE_PLUGINS)
   ChromePluginServiceFilter::GetInstance()->UnregisterResourceContext(
     io_data_.GetResourceContextNoInit());
 #endif
 
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(this)->extension_service();
   if (extension_service && extension_service->extensions_enabled()) {
     extension_service->extension_prefs()->
         ClearIncognitoSessionOnlyContentSettings();
@@ skipping 16 matching lines @@
   g_browser_process->io_thread()->ChangedToOnTheRecord();
 }
 
 void OffTheRecordProfileImpl::InitHostZoomMap() {
   HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
   HostZoomMap* parent_host_zoom_map =
       HostZoomMap::GetForBrowserContext(profile_);
   host_zoom_map->CopyFrom(parent_host_zoom_map);
   // Observe parent's HZM change for propagating change of parent's
   // change to this HZM.
-  registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
-                 content::Source<HostZoomMap>(parent_host_zoom_map));
+  parent_host_zoom_map->AddZoomLevelChangedCallback(zoom_callback_);
 }
 
 #if defined(OS_ANDROID)
 void OffTheRecordProfileImpl::UseSystemProxy() {
   // Force the use of the system-assigned proxy when off the record.
   const char kProxyMode[] = "mode";
   const char kProxyServer[] = "server";
   const char kProxyBypassList[] = "bypass_list";
   const char kProxyPacUrl[] = "pac_url";
   DictionaryPrefUpdate update(prefs_, prefs::kProxy);
@@ skipping 241 matching lines @@
   // closed. We must do this asynchronously in order to avoid reentrancy issues.
   if (!completion.is_null()) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, completion);
   }
 }
 
 GURL OffTheRecordProfileImpl::GetHomePage() {
   return profile_->GetHomePage();
 }
 
-void OffTheRecordProfileImpl::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  if (type == 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);
-      HostZoomMap* parent_host_zoom_map =
-          HostZoomMap::GetForBrowserContext(profile_);
-      double level = parent_host_zoom_map->GetZoomLevel(host);
-      host_zoom_map->SetZoomLevel(host, level);
-    }
-  }
-}
-
 #if defined(OS_CHROMEOS)
 // Special case of the OffTheRecordProfileImpl which is used while Guest
 // session in CrOS.
 class GuestSessionProfile : public OffTheRecordProfileImpl {
  public:
   explicit GuestSessionProfile(Profile* real_profile)
       : OffTheRecordProfileImpl(real_profile) {
   }
 
   virtual void InitChromeOSPreferences() OVERRIDE {
@@ skipping 11 matching lines @@
   OffTheRecordProfileImpl* profile = NULL;
 #if defined(OS_CHROMEOS)
   if (IsGuestSession())
     profile = new GuestSessionProfile(this);
 #endif
   if (!profile)
     profile = new OffTheRecordProfileImpl(this);
   profile->Init();
   return profile;
 }
+
+void OffTheRecordProfileImpl::OnZoomLevelChanged(const std::string& host) {
+  if (host.empty())
+    return;
+
+  HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
+  HostZoomMap* parent_host_zoom_map =
+      HostZoomMap::GetForBrowserContext(profile_);
+  double level = parent_host_zoom_map->GetZoomLevel(host);
+  host_zoom_map->SetZoomLevel(host, level);
+}