summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_contents.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-13 15:40:09 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-13 15:40:09 +0000
commit534e54bfc89ebbdbb345c3b643dc20b2643f1fee (patch)
tree5fcb98f948baf24f15b7c4c136a71df6b85cc1bc /chrome/browser/web_contents.cc
parent8988699d12335b2830dbc4e167244bc0244c97cd (diff)
downloadchromium_src-534e54bfc89ebbdbb345c3b643dc20b2643f1fee.zip
chromium_src-534e54bfc89ebbdbb345c3b643dc20b2643f1fee.tar.gz
chromium_src-534e54bfc89ebbdbb345c3b643dc20b2643f1fee.tar.bz2
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
Diffstat (limited to 'chrome/browser/web_contents.cc')
-rw-r--r--chrome/browser/web_contents.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc
index d9d7f1c..1774c1d 100644
--- a/chrome/browser/web_contents.cc
+++ b/chrome/browser/web_contents.cc
@@ -1513,9 +1513,8 @@ void WebContents::DidNavigateAnyFramePostCommit(
RenderViewHost* render_view_host,
const ViewHostMsg_FrameNavigate_Params& params) {
// Have the controller save the current session.
- controller()->SyncSessionWithEntryByPageID(type(),
- site_instance(),
- params.page_id);
+ controller()->NotifyEntryChangedByPageID(type(), site_instance(),
+ params.page_id);
BroadcastProvisionalLoadCommit(render_view_host, params);
}
@@ -1680,7 +1679,7 @@ void WebContents::UpdateState(RenderViewHost* rvh,
// Notify everybody of the changes (only when the current page changed).
if (changed_flags && entry == controller()->GetActiveEntry())
NotifyNavigationStateChanged(changed_flags);
- controller()->SyncSessionWithEntryByPageID(type(), site_instance(), page_id);
+ controller()->NotifyEntryChangedByPageID(type(), site_instance(), page_id);
}
void WebContents::UpdateTitle(RenderViewHost* rvh,