summaryrefslogtreecommitdiffstats
path: root/chrome/browser/navigation_controller.h
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-15 20:10:49 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-15 20:10:49 +0000
commit849890b62b75f95cf91ebd3fe49f1525ff6595bd (patch)
treed41eef8bb5a3e52ef3a8e356d08d99dd3baacd9f /chrome/browser/navigation_controller.h
parent3a453fa1f16dfa4168e52790e329148366abb05f (diff)
downloadchromium_src-849890b62b75f95cf91ebd3fe49f1525ff6595bd.zip
chromium_src-849890b62b75f95cf91ebd3fe49f1525ff6595bd.tar.gz
chromium_src-849890b62b75f95cf91ebd3fe49f1525ff6595bd.tar.bz2
Cleans up notifications for the NavigationController. There were several
notifications before and some of them were very unclear and misused (STATE_CHANGED). This one, and PRUNED were called unnecessarily in some cases as well. I replaced STATE_CHANGED and INDEX_CHANGED with ENTRY_COMMITTED which is more clear and covers (I think!) all the cases that the callers care about. I added a simple notification testing helper class, and used in the navigation controller unit tests to make sure we get the proper notifications. I had to change NotificationSource/Details to have a = and copy constructor so I can track them easily in my helper. I don't see why this would be bad. As part of this, I got very frustrated recompiling the world whenever navigation_types.h changed. So I removed this dependency from the notification service which everybody includes. Most of the changed files are adding notification_types.h in the .cc file where it's needed. BUG=1325636,1321376,1325779 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/navigation_controller.h')
-rw-r--r--chrome/browser/navigation_controller.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/navigation_controller.h b/chrome/browser/navigation_controller.h
index 070abfa..09bdadf 100644
--- a/chrome/browser/navigation_controller.h
+++ b/chrome/browser/navigation_controller.h
@@ -135,9 +135,6 @@ class NavigationController : public NavigationControllerBase {
const std::wstring& GetLazyTitle() const;
const SkBitmap& GetLazyFavIcon() const;
- // Called when |entry| has been updated outside its NavigationController.
- void EntryUpdated(NavigationEntry* entry);
-
void SetAlternateNavURLFetcher(
AlternateNavURLFetcher* alternate_nav_url_fetcher);
@@ -202,7 +199,7 @@ class NavigationController : public NavigationControllerBase {
virtual int GetMaxPageID() const;
virtual void NavigateToPendingEntry(bool reload);
- virtual void NotifyNavigationStateChanged();
+ virtual void NotifyNavigationEntryCommitted();
// Lets the history database know navigation entries have been removed.
virtual void NotifyPrunedEntries();