DidNavigate refactor of doom

chrome/browser/ssl_blocking_page.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ssl_blocking_page.h"
 
 #include "base/string_piece.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_resources.h"
 #include "chrome/browser/cert_store.h"
@@ skipping 33 matching lines @@
   // If there's already an interstitial in this tab, then we're about to
   // replace it.  We should be ok with just deleting the previous
   // SSLBlockingPage (not hiding it first), since we're about to be shown.
   SSLBlockingPageMap::const_iterator iter = tab_to_blocking_page_->find(tab_);
   if (iter != tab_to_blocking_page_->end()) {
     // Deleting the SSLBlockingPage will also remove it from the map.
     delete iter->second;
 
     // Since WebContents::InterstitialPageGone won't be called, we need
     // to clear the last NavigationEntry manually.
-    tab_->controller()->RemoveLastEntry();
+    tab_->controller()->RemoveLastEntryForInterstitial();
   }
   (*tab_to_blocking_page_)[tab_] = this;
 
   // Register notifications so we can delete ourself if the tab is closed.
   NotificationService::current()->AddObserver(this,
       NOTIFY_TAB_CLOSING,
       Source<NavigationController>(tab_->controller()));
 
   NotificationService::current()->AddObserver(this,
       NOTIFY_INTERSTITIAL_PAGE_CLOSED,
@@ skipping 60 matching lines @@
   std::string html_text(jstemplate_builder::GetTemplateHtml(html,
                                                             &strings,
                                                             "template_root"));
 
   DCHECK(tab_->type() == TAB_CONTENTS_WEB);
   WebContents* tab = tab_->AsWebContents();
   const net::SSLInfo& ssl_info = error_->ssl_info();
   int cert_id = CertStore::GetSharedInstance()->StoreCert(
       ssl_info.cert, tab->render_view_host()->process()->host_id());
 
-  NavigationEntry* nav_entry = new NavigationEntry(TAB_CONTENTS_WEB);
   if (tab_->controller()->GetPendingEntryIndex() == -1) {
-    // New navigation.
-    // We set the page ID to max page id so to ensure the controller considers
-    // this dummy entry a new one.  Because we'll remove the entry when the
-    // interstitial is going away, it will not conflict with any future
-    // navigations.
+    // For new navigations, we just create a new navigation entry.
+    NavigationEntry new_entry(TAB_CONTENTS_WEB);
+    new_entry.set_url(error_->request_url());
+    tab_->controller()->AddDummyEntryForInterstitial(new_entry);
     created_nav_entry_ = true;
-    nav_entry->set_page_id(tab_->GetMaxPageID() + 1);
-    nav_entry->set_url(error_->request_url());
   } else {
-    // Make sure to update the current entry ssl state to reflect the error.
-    *nav_entry = *(tab_->controller()->GetPendingEntry());
+    // When there is a pending entry index, that means we're doing a
+    // back/forward navigation. Clone that entry instead.
+    tab_->controller()->AddDummyEntryForInterstitial(
+        *tab_->controller()->GetPendingEntry());
   }
-  nav_entry->set_page_type(NavigationEntry::INTERSTITIAL_PAGE);
 
-  nav_entry->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN);
-  nav_entry->ssl().set_cert_id(cert_id);
-  nav_entry->ssl().set_cert_status(ssl_info.cert_status);
-  nav_entry->ssl().set_security_bits(ssl_info.security_bits);
-  // The controller will own the entry.
+  NavigationEntry* entry = tab_->controller()->GetActiveEntry();
+  entry->set_page_type(NavigationEntry::INTERSTITIAL_PAGE);
 
-  // The default details is "new navigation", and that's OK with us.
-  NavigationController::LoadCommittedDetails details;
-  tab_->controller()->DidNavigateToEntry(nav_entry, &details);
+  entry->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN);
+  entry->ssl().set_cert_id(cert_id);
+  entry->ssl().set_cert_status(ssl_info.cert_status);
+  entry->ssl().set_security_bits(ssl_info.security_bits);
+  NotificationService::current()->Notify(
+      NOTIFY_SSL_STATE_CHANGED,
+      Source<NavigationController>(tab_->controller()),
+      NotificationService::NoDetails());
+ 
   tab->ShowInterstitialPage(html_text, NULL);
 }
 
 void SSLBlockingPage::Observe(NotificationType type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   switch (type) {
     case NOTIFY_TAB_CLOSING:
     case NOTIFY_INTERSTITIAL_PAGE_CLOSED: {
       // We created a navigation entry for the interstitial, remove it.
       // Note that we don't remove the entry if we are closing all tabs so that
       // the last entry is kept for the restoring on next start-up.
       Browser* browser = Browser::GetBrowserForController(tab_->controller(),
                                                           NULL);
       if (remove_last_entry_ &&
           !browser->tabstrip_model()->closing_all()) {
-        tab_->controller()->RemoveLastEntry();
+        tab_->controller()->RemoveLastEntryForInterstitial();
       }
       delete this;
       break;
     }
     case NOTIFY_DOM_OPERATION_RESPONSE: {
       std::string json =
           Details<DomOperationNotificationDetails>(details)->json();
       if (json == "1") {
         Proceed();
       } else {
@@ skipping 23 matching lines @@
   // entry on navigation since the page id is less than max page id.
   if (!created_nav_entry_)
     remove_last_entry_ = false;
 }
 
 void SSLBlockingPage::DontProceed() {
   NotifyDenyCertificate();
 
   // We are navigating, remove the current entry before we mess with it.
   remove_last_entry_ = false;
-  tab_->controller()->RemoveLastEntry();
+  tab_->controller()->RemoveLastEntryForInterstitial();
 
   NavigationEntry* entry = tab_->controller()->GetActiveEntry();
   if (!entry) {
     // Nothing to go to, default to about:blank.  Navigating will cause the
     // interstitial to hide which will trigger "this" to be deleted.
     tab_->controller()->LoadURL(GURL("about:blank"),
                                 PageTransition::AUTO_BOOKMARK);
   } else if (entry->tab_type() != TAB_CONTENTS_WEB) {
     // Not a WebContent, reload it so to recreate the TabContents for it.
     tab_->controller()->Reload();
@@ skipping 52 matching lines @@
   };
   int i;
   for (i = 0; i < static_cast<int>(extra_info.size()); i++) {
     strings->SetString(keys[i], extra_info[i]);
   }
   for (;i < 5; i++) {
     strings->SetString(keys[i], L"");
   }
 }