NNTP: Merge the recent activities into one list and show more items...

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 "app/animation.h"
 #include "app/l10n_util.h"
@@ skipping 1200 matching lines @@
 
   if (tab_restore_service_)
     TabRestoreServiceChanged(tab_restore_service_);
 }
 
 void RecentlyClosedTabsHandler::TabRestoreServiceChanged(
     TabRestoreService* service) {
   const TabRestoreService::Entries& entries = service->entries();
   ListValue list_value;
   int added_count = 0;
+  const int max_count = NewTabUI::UseOldNewTabPage() ? 3 : 6;
 
   // We filter the list of recently closed to only show 'interesting' entries,
   // where an interesting entry is either a closed window or a closed tab
   // whose selected navigation is not the new tab ui.
   for (TabRestoreService::Entries::const_iterator it = entries.begin();
-       it != entries.end() && added_count < 3; ++it) {
+       it != entries.end() && added_count < max_count; ++it) {
     TabRestoreService::Entry* entry = *it;
     DictionaryValue* value = new DictionaryValue();
     if ((entry->type == TabRestoreService::TAB &&
          TabToValue(*static_cast<TabRestoreService::Tab*>(entry), value)) ||
         (entry->type == TabRestoreService::WINDOW &&
          WindowToValue(*static_cast<TabRestoreService::Window*>(entry),
                        value))) {
       value->SetInteger(L"sessionId", entry->id);
       list_value.Append(value);
       added_count++;
@@ skipping 266 matching lines @@
 bool NewTabUI::UseOldNewTabPage() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kOldNewTabPage);
 }
 
 // static
 bool NewTabUI::WebResourcesDisabled() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kDisableWebResources);
 }