First, this removes the dependency of NavigationController on the

SessionService. There were already some notifications that could be used to
tell what's going on, and I filled out the rest. I moved some notifications from
various places to the NavigationController.

In ssl_blocking_page, I removed a notification because it also calls
DidNavigateToEntry which does the notification (we got duplicate calls before).
In browser.cc I removed the tab parented notification since this is already
called by NavigationController::SetWindowID.

I removed some obsolete notifications and associated structures, especially in
history (like HOST_DELETED that was never issued).

I renamed the window_map_ in the MetricsService becuase it was actually a map
of controllers and Windows.

This also reorders the navigation_types header file to try to bring some order
to it.

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

1 files changed, 3 insertions, 0 deletions

diff --git a/chrome/browser/metrics_service.h b/chrome/browser/metrics_service.h
index 4524bc6..6ffb5f1 100644
--- a/chrome/browser/metrics_service.h
+++ b/chrome/browser/metrics_service.h
@@ -333,6 +333,9 @@ class MetricsService : public NotificationObserver,
   std::vector<std::string> unsent_initial_logs_;
   std::vector<std::string> unsent_ongoing_logs_;
 
+  // Maps NavigationControllers (corresponding to tabs) or Browser
+  // (corresponding to Windows) to a unique integer that we will use to identify
+  // it. |next_window_id_| is used to track which IDs we have used so far.
   typedef std::map<uintptr_t, int> WindowMap;
   WindowMap window_map_;
   int next_window_id_;