New tab page was linking to the wrong URL for the history page.

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 "build/build_config.h"
 
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 
 #include "base/histogram.h"
 #include "base/string_piece.h"
@@ skipping 225 matching lines @@
   }
   DictionaryValue localized_strings;
   localized_strings.SetString(L"title", title);
   localized_strings.SetString(L"mostvisited", most_visited);
   localized_strings.SetString(L"searches",
       l10n_util::GetString(IDS_NEW_TAB_SEARCHES));
   localized_strings.SetString(L"bookmarks",
       l10n_util::GetString(IDS_NEW_TAB_BOOKMARKS));
   localized_strings.SetString(L"showhistory",
       l10n_util::GetString(IDS_NEW_TAB_HISTORY_SHOW));
+  localized_strings.SetString(L"showhistoryurl",
+      chrome::kChromeUIHistoryURL);
   localized_strings.SetString(L"searchhistory",
       l10n_util::GetString(IDS_NEW_TAB_HISTORY_SEARCH));
   localized_strings.SetString(L"recentlyclosed",
       l10n_util::GetString(IDS_NEW_TAB_RECENTLY_CLOSED));
   localized_strings.SetString(L"mostvisitedintro",
       l10n_util::GetStringF(IDS_NEW_TAB_MOST_VISITED_INTRO,
           l10n_util::GetString(IDS_WELCOME_PAGE_URL)));
   localized_strings.SetString(L"closedwindow",
       l10n_util::GetString(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW));
 
@@ skipping 642 matching lines @@
   return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HistoryHandler
 
 class HistoryHandler : public DOMMessageHandler {
  public:
   explicit HistoryHandler(DOMUI* dom_ui);
 
-  // Callback which navigates to the history page.
-  void HandleShowHistoryPage(const Value*);
-
   // Callback which navigates to the history page and performs a search.
   void HandleSearchHistoryPage(const Value* content);
 
  private:
   DOMUI* dom_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryHandler);
 };
 
 HistoryHandler::HistoryHandler(DOMUI* dom_ui)
     : DOMMessageHandler(dom_ui),
       dom_ui_(dom_ui) {
-  dom_ui->RegisterMessageCallback("showHistoryPage",
-      NewCallback(this, &HistoryHandler::HandleShowHistoryPage));
   dom_ui->RegisterMessageCallback("searchHistoryPage",
       NewCallback(this, &HistoryHandler::HandleSearchHistoryPage));
 }
 
-void HistoryHandler::HandleShowHistoryPage(const Value*) {
-  NavigationController* controller = dom_ui_->web_contents()->controller();
-  if (controller) {
-    UserMetrics::RecordAction(L"NTP_ShowHistory", dom_ui_->GetProfile());
-    controller->LoadURL(GURL(chrome::kChromeUINewTabURL), GURL(),
-                        PageTransition::LINK);
-    // We are deleted by LoadURL, so do not call anything else.
-  }
-}
-
 void HistoryHandler::HandleSearchHistoryPage(const Value* content) {
   if (content && content->GetType() == Value::TYPE_LIST) {
     const ListValue* list_value = static_cast<const ListValue*>(content);
     Value* list_member;
     if (list_value->Get(0, &list_member) &&
         list_member->GetType() == Value::TYPE_STRING) {
       const StringValue* string_value =
           static_cast<const StringValue*>(list_member);
       std::wstring wstring_value;
       if (string_value->GetAsString(&wstring_value)) {
@@ skipping 113 matching lines @@
 #endif
 
     NewTabHTMLSource* html_source = new NewTabHTMLSource();
 
     g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(&chrome_url_data_manager,
             &ChromeURLDataManager::AddDataSource,
             html_source));
   }
 }