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

chrome/browser/ui/search/instant_page.cc

 // Copyright 2013 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_page.h"
 
 #include "apps/app_launcher.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/history/most_visited_tiles_experiment.h"
+#include "chrome/browser/history/top_sites.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/ui/browser_finder.h"
 #include "chrome/browser/ui/search/instant_tab.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/tabs/tab_strip_model_utils.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 153 matching lines @@
   if (is_main_frame)
     delegate_->InstantPageLoadFailed(contents());
 }
 
 void InstantPage::ThemeInfoChanged(const ThemeBackgroundInfo& theme_info) {
   sender()->SendThemeBackgroundInfo(theme_info);
 }
 
 void InstantPage::MostVisitedItemsChanged(
     const std::vector<InstantMostVisitedItem>& items) {
-  sender()->SendMostVisitedItems(items);
+  std::vector<InstantMostVisitedItem> items_copy(items);
+  MaybeRemoveMostVisitedItems(&items_copy);
+
+  sender()->SendMostVisitedItems(items_copy);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_INSTANT_SENT_MOST_VISITED_ITEMS,
       content::Source<InstantPage>(this),
       content::NotificationService::NoDetails());
 }
 
 void InstantPage::ModelChanged(const SearchModel::State& old_state,
                                const SearchModel::State& new_state) {
   if (old_state.instant_support != new_state.instant_support)
@@ skipping 75 matching lines @@
   delegate_->UndoAllMostVisitedDeletions();
 }
 
 void InstantPage::ClearContents() {
   if (contents())
     SearchTabHelper::FromWebContents(contents())->model()->RemoveObserver(this);
 
   sender()->SetContents(NULL);
   Observe(NULL);
 }
+
+void InstantPage::MaybeRemoveMostVisitedItems(
+    std::vector<InstantMostVisitedItem>* items) {
+// The code below uses APIs not available on Android and the experiment should
+// not run there.
+#if !defined(OS_ANDROID)
+  if (!history::MostVisitedTilesExperiment::IsDontShowOpenURLsEnabled()) {
+    return;
+  }

[Alexei Svitkine (slow), 2013/07/24 18:37:36]

No need for {}'s.

[annark1, 2013/07/24 20:43:31]

Done.

+
+  TabStripModel* tab_strip_model = chrome::FindBrowserWithProfile(
+      profile_,
+      chrome::GetActiveDesktop())->tab_strip_model();
+  history::TopSites* top_sites = profile_->GetTopSites();

[Alexei Svitkine (slow), 2013/07/24 18:37:36]

I still think this whole thing can be a shared function somewhere under ui/,
maybe tab strip utils.

All it actually needs to take as a parameter is a TabStripModel*, because from
it you can get a Profile* from which you can get a TopSites*.

[Alexei Svitkine (slow), 2013/07/24 19:17:12]

Nevermind, I see it's calling subtly different methods below on the
MostVisitedTilesExperiment.

[annark1, 2013/07/24 20:43:31]

ok.
On 2013/07/24 19:17:12, Alexei Svitkine wrote:

+  if (!tab_strip_model || !top_sites) {
+    NOTREACHED();
+    return;
+  }
+
+  std::set<std::string> open_urls;
+  chrome::GetOpenUrls(*tab_strip_model, *top_sites, &open_urls);
+  history::MostVisitedTilesExperiment::RemoveItemsMatchingOpenTabs(
+      open_urls, items);
+
+#endif
+}