Field trial removing tiles from NTP if URL is already open - for 1993 clients

chrome/browser/ui/search/instant_controller.cc

 // Copyright 2012 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/ui/search/instant_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/search/instant_ntp.h"
 #include "chrome/browser/ui/search/instant_tab.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/sessions/serialized_navigation_entry.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ skipping 71 matching lines @@
 template <typename T>
 void DeletePageSoon(scoped_ptr<T> page) {
   if (page->contents()) {
     base::MessageLoop::current()->DeleteSoon(
         FROM_HERE, page->ReleaseContents().release());
   }
 
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, page.release());
 }
 
+// Creates a set containing the canonical URLs of the currently open tabs.
+void GetOpenUrls(const TabStripModel& tabs,
+                 const history::TopSites& ts,

[Alexei Svitkine (slow), 2013/07/04 20:28:30]

Nit: ts -> top_sites

[annark1, 2013/07/16 18:07:09]

Done.

+                 std::set<std::string>* urls) {
+  for (int i = 0; i < tabs.count(); ++i) {
+    content::WebContents* web_contents = tabs.GetWebContentsAt(i);
+    if (web_contents)
+      urls->insert(ts.GetCanonicalURLString(web_contents->GetURL()));
+  }
+}
+
 }  // namespace
 
 InstantController::InstantController(BrowserInstantController* browser,
                                      bool extended_enabled)
     : browser_(browser),
       extended_enabled_(extended_enabled),
       omnibox_focus_state_(OMNIBOX_FOCUS_NONE),
       omnibox_focus_change_reason_(OMNIBOX_FOCUS_CHANGE_EXPLICIT),
       omnibox_bounds_(-1, -1, 0, 0) {
 
@@ skipping 182 matching lines @@
   if (debug_events_.size() > kMaxDebugEventSize)
     debug_events_.pop_back();
 }
 
 void InstantController::ClearDebugEvents() {
   debug_events_.clear();
 }
 
 void InstantController::MostVisitedItemsChanged(
     const std::vector<InstantMostVisitedItem>& items) {
+
+  std::vector<InstantMostVisitedItem> items_copy(items);
+  MaybeRemoveMostVisitedItems(&items_copy);

[Alexei Svitkine (slow), 2013/07/04 20:28:30]

Is |items_copy| being used anywhere? Did you mean to invoke the calls below on
items_copy instead of items?

[annark1, 2013/07/16 18:07:09]

Yes, I did. Thank you for catching this error.

On 2013/07/04 20:28:30, Alexei Svitkine wrote:

+
   if (ntp_)
     ntp_->sender()->SendMostVisitedItems(items);
   if (instant_tab_)
     instant_tab_->sender()->SendMostVisitedItems(items);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_INSTANT_SENT_MOST_VISITED_ITEMS,
       content::Source<InstantController>(this),
       content::NotificationService::NoDetails());
 }
@@ skipping 342 matching lines @@
 
 bool InstantController::InStartup() const {
   // TODO(shishir): This is not completely reliable. Find a better way to detect
   // startup time.
   return !browser_->GetActiveWebContents();
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(profile());
 }
+
+void InstantController::MaybeRemoveMostVisitedItems(
+    std::vector<InstantMostVisitedItem>* items) {
+#if !defined(OS_ANDROID)

[Alexei Svitkine (slow), 2013/07/04 20:28:30]

Add a comment about why this shouldn't apply to android.

[annark1, 2013/07/16 18:07:09]

Done.

+  if (!history::TopSites::IsClientInTabsGroup())
+    return;
+
+  const TabStripModel* tab_strip_model = browser_->tab_strip_model();
+  history::TopSites* top_sites = browser_->profile()->GetTopSites();
+  if (!tab_strip_model || !top_sites) {
+    NOTREACHED();
+    return;
+  }
+
+  std::set<std::string> open_urls;
+  GetOpenUrls(*tab_strip_model, *top_sites, &open_urls);
+  history::TopSites::RemoveItemsMatchingOpenTabs(open_urls, items);
+#endif
+}