Refactoring recently closed tab filtering

chrome/browser/sessions/tab_restore_service.cc

 // Copyright (c) 2011 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/sessions/tab_restore_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
+#include <set>
 
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
@@ skipping 264 matching lines @@
   set_pending_reset(true);
 
   // Schedule a command, otherwise if there are no pending commands Save does
   // nothing.
   ScheduleCommand(CreateRestoredEntryCommand(1));
 
   STLDeleteElements(&entries_);
   NotifyTabsChanged();
 }
 
+namespace {
+// This class is used to compare two entries and considers that they are
+// identical if they share the same URL. See FilteredEntries() below for how
+// this is used.
+class EntryComparator {
+ public:
+  bool operator() (const TabRestoreService::Entry* lhs,
+                   const TabRestoreService::Entry* rhs) const {
+    // Two entries are deemed identical when their visible title and URL are the
+    // same.
+    if (lhs->type == TabRestoreService::WINDOW ||
+        rhs->type == TabRestoreService::WINDOW)
+      return false;
+
+    DCHECK(lhs->type == TabRestoreService::TAB);
+    DCHECK(rhs->type == TabRestoreService::TAB);
+

[sky, 2011/09/19 16:23:15]

remove one of these lines.

[noyau (Ping after 24h), 2011/09/20 15:46:58]

Done in session_utils.cc

+
+    const TabRestoreService::Tab* rh_tab =
+        static_cast<const TabRestoreService::Tab*>(rhs);
+    const TabRestoreService::Tab* lh_tab =
+        static_cast<const TabRestoreService::Tab*>(lhs);
+
+    const TabNavigation& rh_entry =
+        rh_tab->navigations[rh_tab->current_navigation_index];
+    const TabNavigation& lh_entry =
+        lh_tab->navigations[lh_tab->current_navigation_index];
+
+    if (rh_entry.title() == lh_entry.title())
+      return rh_entry.virtual_url().spec() < lh_entry.virtual_url().spec();
+    else

[sky, 2011/09/19 16:23:15]

no else

[noyau (Ping after 24h), 2011/09/20 15:46:58]

Done in session_utils.cc

+      return rh_entry.title() < lh_entry.title();
+  }
+};
+}  // namespace
+
+void TabRestoreService::FilteredEntries(
+    TabRestoreService::Entries* filteredEntries) const {
+  // A set to remember the entries we already seen.
+  std::set<Entry*, EntryComparator> uniquing;
+
+  TabRestoreService::Entries::const_iterator iter;

[sky, 2011/09/19 16:23:15]

put iterator into for loop.

[noyau (Ping after 24h), 2011/09/20 15:46:58]

Done in session_utils.cc

+  for (iter = entries_.begin(); iter != entries_.end(); ++iter) {
+    Entry* entry = *iter;
+
+    if (uniquing.insert(entry).second)
+      // This entry was not seen before, add it to the list.
+      filteredEntries->push_back(entry);
+  }
+}
+
 const TabRestoreService::Entries& TabRestoreService::entries() const {
   return entries_;
 }
 
 void TabRestoreService::RestoreMostRecentEntry(
     TabRestoreServiceDelegate* delegate) {
   if (entries_.empty())
     return;
 
   RestoreEntryById(delegate, entries_.front()->id, false);
@@ skipping 781 matching lines @@
   // correctly write out the entries when Save is invoked (Save starts from
   // the front, not the end and we just added the entries to the end).
   entries_to_write_ = staging_entries_.size();
 
   PruneAndNotify();
 }
 
 Time TabRestoreService::TimeNow() const {
   return time_factory_ ? time_factory_->TimeNow() : Time::Now();
 }