DidNavigate refactor of doom

chrome/browser/tab_contents.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/tab_contents.h"
 
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/views/download_shelf_view.h"
 #include "chrome/browser/views/download_started_animation.h"
@@ skipping 42 matching lines @@
   // Reset the parent to NULL to ensure hidden tabs don't receive messages.
   SetParent(GetContainerHWND(), NULL);
 
   // Remove any focus manager related information.
   ChromeViews::FocusManager::UninstallFocusSubclass(GetContainerHWND());
 
   WasHidden();
 }
 
 int32 TabContents::GetMaxPageID() {
-  if (AsWebContents())
-    return AsWebContents()->site_instance()->max_page_id();
+  if (GetSiteInstance())
+    return GetSiteInstance()->max_page_id();
   else
     return max_page_id_;
 }
 
 void TabContents::UpdateMaxPageID(int32 page_id) {
-  if (AsWebContents()) {
-    // Ensure both the SiteInstance and RenderProcessHost update their max page
-    // IDs in sync.
-    AsWebContents()->site_instance()->UpdateMaxPageID(page_id);
+  // Ensure both the SiteInstance and RenderProcessHost update their max page
+  // IDs in sync. Only WebContents will also have site instances, except during
+  // testing.
+  if (GetSiteInstance())
+    GetSiteInstance()->UpdateMaxPageID(page_id);
+
+  if (AsWebContents())
     AsWebContents()->process()->UpdateMaxPageID(page_id);
-  } else {
+  else
     max_page_id_ = std::max(max_page_id_, page_id);
-  }
 }
 
 const std::wstring TabContents::GetDefaultTitle() const {
   return l10n_util::GetString(IDS_DEFAULT_TAB_TITLE);
 }
 
 void TabContents::SetupController(Profile* profile) {
   DCHECK(!controller_);
   controller_ = new NavigationController(this, profile);
 }
@@ skipping 161 matching lines @@
   if (delegate_)
     delegate_->LoadingStateChanged(this);
 
   NotificationService::current()->
       Notify((is_loading ? NOTIFY_LOAD_START : NOTIFY_LOAD_STOP),
               Source<NavigationController>(this->controller()),
               details ? Details<LoadNotificationDetails>(details) :
                         NotificationService::NoDetails());
 }
 
-void TabContents::DidNavigateToEntry(
-    NavigationEntry* entry,
-    NavigationController::LoadCommittedDetails* details) {
-  // The entry may be deleted by DidNavigateToEntry...
-  int new_page_id = entry->page_id();
-
-  controller_->DidNavigateToEntry(entry, details);
-
-  // update after informing the navigation controller so it can check the
-  // previous value of the max page id.
-  UpdateMaxPageID(new_page_id);
-}
-
-bool TabContents::Navigate(const NavigationEntry& entry, bool reload) {
-  NavigationEntry* new_entry = new NavigationEntry(entry);
-  if (new_entry->page_id() == -1) {
-    // This is a new navigation.  Our behavior is to always navigate to the
-    // same page (page 0) in response to a navigation.
-    new_entry->set_page_id(0);
-    new_entry->set_title(GetDefaultTitle());
-  }
-
-  // When we're commanded to navigate like this, it's always a new main frame
-  // navigation (which is the default for the details).
-  NavigationController::LoadCommittedDetails details;
-  if (controller()->GetLastCommittedEntry())
-    details.previous_url = controller()->GetLastCommittedEntry()->url();
-
-  DidNavigateToEntry(new_entry, &details);
+bool TabContents::NavigateToPendingEntry(bool reload) {
+  // Our benavior is just to report that the entry was committed.
+  controller()->GetPendingEntry()->set_title(GetDefaultTitle());
+  controller()->CommitPendingEntry();
   return true;
 }
 
 void TabContents::NotifyNavigationStateChanged(unsigned changed_flags) {
   if (delegate_)
     delegate_->NavigationStateChanged(this, changed_flags);
 }
 
 void TabContents::NotifyDidNavigate(NavigationType nav_type,
                                     int relative_navigation_offset) {
@@ skipping 288 matching lines @@
   if (was_shelf_visible)
     to->MigrateShelfViewFrom(from);
   to->SetDownloadShelfVisible(was_shelf_visible);
 }
 
 // static
 void TabContents::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kBlockPopups, false);
 }