Moving notification types which are chrome specific to a new header file chrome_notification_type...

content/common/notification_service.h

 // Copyright (c) 2011 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.
 
 // This file describes a central switchboard for notifications that might
 // happen in various parts of the application, and allows users to register
 // observers for various classes of events that they're interested in.
 
 #ifndef CONTENT_COMMON_NOTIFICATION_SERVICE_H_
 #define CONTENT_COMMON_NOTIFICATION_SERVICE_H_
 #pragma once
 
 #include <map>
+#include <vector>

[darin (slow to review), 2011/07/07 22:54:56]

nit: looks like this include is not needed.

 
 #include "base/observer_list.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "content/common/notification_type.h"
 
 class NotificationObserver;
 
 class NotificationService {
  public:
@@ skipping 24 matching lines @@
 
   // Returns a NotificationDetails object that represents a lack of details
   // associated with a notification.  (This is effectively a null pointer.)
   static Details<void> NoDetails() { return Details<void>(NULL); }
 
  private:
   friend class NotificationRegistrar;
 
   typedef ObserverList<NotificationObserver> NotificationObserverList;
   typedef std::map<uintptr_t, NotificationObserverList*> NotificationSourceMap;
+  typedef std::map<int, NotificationSourceMap> NotificationObserverMap;
+  typedef std::map<int, int> NotificationObserverCount;
 
   // Convenience function to determine whether a source has a
   // NotificationObserverList in the given map;
   static bool HasKey(const NotificationSourceMap& map,
                      const NotificationSource& source);
 
   // NOTE: Rather than using this directly, you should use a
   // NotificationRegistrar.
   //
   // Registers a NotificationObserver to be called whenever a matching
@@ skipping 19 matching lines @@
   //
   // Removes the object pointed to by observer from receiving notifications
   // that match type and source.  If no object matching the parameters is
   // currently registered, this method is a no-op.
   void RemoveObserver(NotificationObserver* observer,
                       NotificationType type, const NotificationSource& source);
 
   // Keeps track of the observers for each type of notification.
   // Until we get a prohibitively large number of notification types,
   // a simple array is probably the fastest way to dispatch.
-  NotificationSourceMap observers_[NotificationType::NOTIFICATION_TYPE_COUNT];
+  NotificationObserverMap observers_;
 
 #ifndef NDEBUG
   // Used to check to see that AddObserver and RemoveObserver calls are
   // balanced.
-  int observer_counts_[NotificationType::NOTIFICATION_TYPE_COUNT];
+  NotificationObserverCount observer_counts_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(NotificationService);
 };
 
 #endif  // CONTENT_COMMON_NOTIFICATION_SERVICE_H_