DidNavigate refactor of doom

chrome/browser/dom_ui/new_tab_ui.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/dom_ui/new_tab_ui.h"
 
 #include "base/histogram.h"
 #include "base/string_piece.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser.h"
@@ skipping 779 matching lines @@
 
     NewTabHTMLSource* html_source = new NewTabHTMLSource();
 
     g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(&chrome_url_data_manager,
             &ChromeURLDataManager::AddDataSource,
             html_source));
   }
 }
 
-bool NewTabUIContents::Navigate(const NavigationEntry& entry, bool reload) {
-  const bool result = WebContents::Navigate(entry, reload);
-
-  // Force the title to say 'New tab', even when loading. The supplied entry is
-  // also the pending entry.
-  NavigationEntry* pending_entry = controller()->GetPendingEntry();
-  DCHECK(pending_entry && pending_entry == &entry);
-  pending_entry->set_title(forced_title_);
-
+bool NewTabUIContents::NavigateToPendingEntry(bool reload) {
+  const bool result = WebContents::NavigateToPendingEntry(reload);
+  controller()->GetPendingEntry()->set_title(forced_title_);
   return result;
 }
 
 const std::wstring& NewTabUIContents::GetTitle() const {
   if (!forced_title_.empty())
     return forced_title_;
   return WebContents::GetTitle();
 }
 
 void NewTabUIContents::SetInitialFocus() {
@@ skipping 30 matching lines @@
     for (size_t i = 0; i < urls.size(); ++i) {
       if (url == urls[i]) {
         UserMetrics::RecordComputedAction(StringPrintf(L"MostVisited%d", i),
                                           profile());
         break;
       }
     }
   }
 }