content: convert zoom notifications to observer usage

content/browser/host_zoom_map_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 <cmath>
 
 #include "content/browser/host_zoom_map_impl.h"
 
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
@@ skipping 72 matching lines @@
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     RenderProcessHost* render_process_host = i.GetCurrentValue();
     if (HostZoomMap::GetForBrowserContext(
             render_process_host->GetBrowserContext()) == this) {
       render_process_host->Send(
           new ViewMsg_SetZoomLevelForCurrentURL(host, level));
     }
   }
 
-  NotificationService::current()->Notify(
-      NOTIFICATION_ZOOM_LEVEL_CHANGED,
-      Source<HostZoomMap>(this),
-      Details<const std::string>(&host));
+  for (std::vector<ZoomLevelChangedCallback>::iterator i =

[jam, 2013/01/30 17:50:44]

nit: here and below, using 

for (size_t i = 0; i < vector_class_.size(); ++i)

is much more readable

[Paweł Hajdan Jr., 2013/01/31 16:02:15]

Done. For deletion I'm still using iterators - I can convert to using indexes,
I'd use an explicit temporary std::vector then.

[jam, 2013/01/31 17:59:15]

not sure why you'd use a temporary std::vector?  a callback should only be in
there once. so

for (size_t i = 0; i < vector_class_.size(); ++i) {
  if (zoom_level_changed_callbacks_[i] == callback) {
    zoom_level_changed_callbacks_.erase(zoom_level_changed_callbacks_.begin() +
i);
    return;
  }
}

should be enough

+           zoom_level_changed_callbacks_.begin();
+       i != zoom_level_changed_callbacks_.end();
+       ++i) {
+    (*i).Run(host);
+  }
 }
 
 double HostZoomMapImpl::GetDefaultZoomLevel() const {
   return default_zoom_level_;
 }
 
 void HostZoomMapImpl::SetDefaultZoomLevel(double level) {
   default_zoom_level_ = level;
 }
 
+void HostZoomMapImpl::AddZoomLevelChangedCallback(
+    ZoomLevelChangedCallback callback) {
+  zoom_level_changed_callbacks_.push_back(callback);
+}
+
+void HostZoomMapImpl::RemoveZoomLevelChangedCallback(
+    ZoomLevelChangedCallback callback) {
+  for (std::vector<ZoomLevelChangedCallback>::iterator i =
+           zoom_level_changed_callbacks_.begin();
+       i != zoom_level_changed_callbacks_.end();
+       ++i) {
+    if ((*i).Equals(callback)) {
+      i = zoom_level_changed_callbacks_.erase(i);
+    }
+  }
+}
+
 double HostZoomMapImpl::GetTemporaryZoomLevel(int render_process_id,
                                               int render_view_id) const {
   base::AutoLock auto_lock(lock_);
   for (size_t i = 0; i < temporary_zoom_levels_.size(); ++i) {
     if (temporary_zoom_levels_[i].render_process_id == render_process_id &&
         temporary_zoom_levels_[i].render_view_id == render_view_id) {
       return temporary_zoom_levels_[i].zoom_level;
     }
   }
   return 0;
@@ skipping 21 matching lines @@
 
     if (level && i == temporary_zoom_levels_.size()) {
       TemporaryZoomLevel temp;
       temp.render_process_id = render_process_id;
       temp.render_view_id = render_view_id;
       temp.zoom_level = level;
       temporary_zoom_levels_.push_back(temp);
     }
   }
 
-  std::string host;
-  NotificationService::current()->Notify(
-      NOTIFICATION_ZOOM_LEVEL_CHANGED,
-      Source<HostZoomMap>(this),
-      Details<const std::string>(&host));
+  for (std::vector<ZoomLevelChangedCallback>::iterator i =
+           zoom_level_changed_callbacks_.begin();
+       i != zoom_level_changed_callbacks_.end();
+       ++i) {
+    (*i).Run(std::string());
+  }
 }
 
 void HostZoomMapImpl::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   switch (type) {
     case NOTIFICATION_RENDER_VIEW_HOST_WILL_CLOSE_RENDER_VIEW: {
       base::AutoLock auto_lock(lock_);
       int render_view_id = Source<RenderViewHost>(source)->GetRoutingID();
       int render_process_id =
@@ skipping 10 matching lines @@
     }
     default:
       NOTREACHED() << "Unexpected preference observed.";
   }
 }
 
 HostZoomMapImpl::~HostZoomMapImpl() {
 }
 
 }  // namespace content