Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(773)

Unified Diff: content/browser/web_contents/navigation_controller_impl.cc

Issue 23947003: Create WebContentsObserver callbacks for notifications, remove notifications from SSLManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: formatting Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/navigation_controller_impl.cc
diff --git a/content/browser/web_contents/navigation_controller_impl.cc b/content/browser/web_contents/navigation_controller_impl.cc
index c4a0c249c6cd645a1d4b56dacec7e7d343cf24c5..36f2b0088ddf9eb3257a78643cc9860493d11c65 100644
--- a/content/browser/web_contents/navigation_controller_impl.cc
+++ b/content/browser/web_contents/navigation_controller_impl.cc
@@ -1558,21 +1558,18 @@ void NavigationControllerImpl::NavigateToPendingEntry(ReloadType reload_type) {
void NavigationControllerImpl::NotifyNavigationEntryCommitted(
LoadCommittedDetails* details) {
details->entry = GetActiveEntry();
- NotificationDetails notification_details =
- Details<LoadCommittedDetails>(details);
// We need to notify the ssl_manager_ before the web_contents_ so the
// location bar will have up-to-date information about the security style
// when it wants to draw. See http://crbug.com/11157
- ssl_manager_.DidCommitProvisionalLoad(notification_details);
+ ssl_manager_.DidCommitProvisionalLoad(*details);
- // TODO(pkasting): http://b/1113079 Probably these explicit notification paths
- // should be removed, and interested parties should just listen for the
- // notification below instead.
web_contents_->NotifyNavigationStateChanged(kInvalidateAll);
-
web_contents_->NotifyNavigationEntryCommitted(*details);
+ // TODO(avi): Remove. http://crbug.com/170921
+ NotificationDetails notification_details =
+ Details<LoadCommittedDetails>(details);
NotificationService::current()->Notify(
NOTIFICATION_NAV_ENTRY_COMMITTED,
Source<NavigationController>(this),
« no previous file with comments | « content/browser/web_contents/navigation_controller_impl.h ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698