Stop the location bar from flashing white when navigating from one HTTPS site to another. To do this, we have to make sure the SSLManager sees the DidCommitProvisionalLoad event before the location bar draws itself to the screen.

BUG=11157
TEST=Navigate from one HTTPS site to another and watch the location bar carefully.  It shouln't flash anymore.

Review URL: http://codereview.chromium.org/99247

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

1 files changed, 10 insertions, 2 deletions

diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index 268eadb..d8aca75 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -865,17 +865,25 @@ void NavigationController::NavigateToPendingEntry(bool reload) {
 
 void NavigationController::NotifyNavigationEntryCommitted(
     LoadCommittedDetails* details) {
+  details->entry = GetActiveEntry();
+  NotificationDetails notification_details =
+      Details<LoadCommittedDetails>(details);
+
+  // We need to notify the ssl_manager_ before the tab_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);
+
   // TODO(pkasting): http://b/1113079 Probably these explicit notification paths
   // should be removed, and interested parties should just listen for the
   // notification below instead.
   tab_contents_->NotifyNavigationStateChanged(
       TabContents::INVALIDATE_EVERYTHING);
 
-  details->entry = GetActiveEntry();
   NotificationService::current()->Notify(
       NotificationType::NAV_ENTRY_COMMITTED,
       Source<NavigationController>(this),
-      Details<LoadCommittedDetails>(details));
+      notification_details);
 }
 
 // static