Moved Discovery out of the Suggested Page

chrome/browser/ui/webui/ntp/suggestions_page_handler.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_page_handler.h"
 
 #include <math.h>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/md5.h"
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/suggestions_combiner.h"
 #include "chrome/browser/ui/webui/ntp/ntp_stats.h"
+#include "chrome/browser/ui/webui/ntp/suggestions_source_top_sites.h"
 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
@@ skipping 40 matching lines @@
     // show the new tab page.
     top_sites->SyncWithHistory();
 
     // Register for notification when TopSites changes so that we can update
     // ourself.
     registrar_.Add(this, chrome::NOTIFICATION_TOP_SITES_CHANGED,
                    content::Source<history::TopSites>(top_sites));
   }
 
   // Setup the suggestions sources.
-  suggestions_combiner_.reset(SuggestionsCombiner::Create(this, profile));
+  SuggestionsCombiner* combiner = new SuggestionsCombiner(this, profile);
+  combiner->AddSource(new SuggestionsSourceTopSites());
+  suggestions_combiner_.reset(combiner);
 
   // We pre-emptively make a fetch for suggestions so we have the results
   // sooner.
   suggestions_combiner_->FetchItems(profile);
 
   web_ui()->RegisterMessageCallback("getSuggestions",
       base::Bind(&SuggestionsHandler::HandleGetSuggestions,
                  base::Unretained(this)));
   // Register ourselves for any suggestions item blacklisting.
   web_ui()->RegisterMessageCallback("blacklistURLFromSuggestions",
@@ skipping 89 matching lines @@
 }
 
 std::string SuggestionsHandler::GetDictionaryKeyForURL(const std::string& url) {
   return base::MD5String(url);
 }
 
 // static
 void SuggestionsHandler::RegisterUserPrefs(PrefService* prefs) {
   // TODO(georgey) add user preferences (such as own blacklist) as needed.
 }