Moved Discovery out of the Suggested Page

chrome/browser/ui/webui/ntp/suggestions_combiner.cc

 // Copyright (c) 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/webui/ntp/suggestions_combiner.h"
 
 #include <algorithm>
 
 #include "base/values.h"
 #include "chrome/browser/extensions/api/discovery/suggested_links_registry.h"
 #include "chrome/browser/extensions/api/discovery/suggested_links_registry_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/webui/ntp/suggestions_page_handler.h"
 #include "chrome/browser/ui/webui/ntp/suggestions_source.h"
 #include "chrome/browser/ui/webui/ntp/suggestions_source_discovery.h"
-#include "chrome/browser/ui/webui/ntp/suggestions_source_top_sites.h"
 #include "content/public/browser/web_contents.h"
 
 namespace {
 
 static const size_t kSuggestionsCount = 8;
 
 }  // namespace
 
 SuggestionsCombiner::SuggestionsCombiner(
     SuggestionsCombiner::Delegate* delegate,
@@ skipping 43 matching lines @@
 }
 
 void SuggestionsCombiner::SetSuggestionsCount(size_t suggestions_count) {
   suggestions_count_ = suggestions_count;
 }
 
 // static
 SuggestionsCombiner* SuggestionsCombiner::Create(
     SuggestionsCombiner::Delegate* delegate, Profile* profile) {
   SuggestionsCombiner* combiner = new SuggestionsCombiner(delegate, profile);
-  combiner->AddSource(new SuggestionsSourceTopSites());
-
   extensions::SuggestedLinksRegistry* registry =
       extensions::SuggestedLinksRegistryFactory::GetForProfile(profile);
   scoped_ptr<std::vector<std::string> > list = registry->GetExtensionIds();
   for (std::vector<std::string>::iterator it = list->begin();
       it != list->end(); ++it) {
     combiner->AddSource(new SuggestionsSourceDiscovery(*it));
   }
 
   return combiner;
 }
@@ skipping 68 matching lines @@
       continue;
 
     for (int i = 0; i < browser->tab_count(); i++) {
       const content::WebContents* tab = chrome::GetWebContentsAt(browser, i);
       if (tab->GetURL() == url)
         return true;
     }
   }
   return false;
 }