OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/android/ntp/most_visited_sites.h" | 5 #include "chrome/browser/android/ntp/most_visited_sites.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/metrics/field_trial.h" | 11 #include "base/metrics/field_trial.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
13 #include "base/metrics/sparse_histogram.h" | 13 #include "base/metrics/sparse_histogram.h" |
14 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
15 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
16 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
17 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
18 #include "base/time/time.h" | 18 #include "base/time/time.h" |
19 #include "chrome/browser/history/top_sites_factory.h" | 19 #include "chrome/browser/history/top_sites_factory.h" |
20 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
21 #include "chrome/browser/search/suggestions/suggestions_service_factory.h" | 21 #include "chrome/browser/search/suggestions/suggestions_service_factory.h" |
| 22 #include "chrome/browser/search_engines/template_url_service_factory.h" |
22 #include "chrome/browser/supervised_user/supervised_user_service.h" | 23 #include "chrome/browser/supervised_user/supervised_user_service.h" |
23 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 24 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
24 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" | 25 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" |
25 #include "chrome/browser/thumbnails/thumbnail_list_source.h" | 26 #include "chrome/browser/thumbnails/thumbnail_list_source.h" |
26 #include "chrome/common/chrome_switches.h" | 27 #include "chrome/common/chrome_switches.h" |
27 #include "chrome/common/pref_names.h" | 28 #include "chrome/common/pref_names.h" |
28 #include "components/history/core/browser/top_sites.h" | 29 #include "components/history/core/browser/top_sites.h" |
29 #include "components/pref_registry/pref_registry_syncable.h" | 30 #include "components/pref_registry/pref_registry_syncable.h" |
30 #include "components/prefs/pref_service.h" | 31 #include "components/prefs/pref_service.h" |
31 #include "components/variations/variations_associated_data.h" | 32 #include "components/variations/variations_associated_data.h" |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 } | 197 } |
197 | 198 |
198 void MostVisitedSites::SetMostVisitedURLsObserver( | 199 void MostVisitedSites::SetMostVisitedURLsObserver( |
199 MostVisitedSites::Observer* observer, int num_sites) { | 200 MostVisitedSites::Observer* observer, int num_sites) { |
200 observer_ = observer; | 201 observer_ = observer; |
201 num_sites_ = num_sites; | 202 num_sites_ = num_sites; |
202 | 203 |
203 if (ShouldShowPopularSites() && | 204 if (ShouldShowPopularSites() && |
204 NeedPopularSites(profile_->GetPrefs(), num_sites_)) { | 205 NeedPopularSites(profile_->GetPrefs(), num_sites_)) { |
205 popular_sites_.reset(new PopularSites( | 206 popular_sites_.reset(new PopularSites( |
206 profile_, | 207 profile_->GetPrefs(), |
| 208 TemplateURLServiceFactory::GetForProfile(profile_), |
| 209 profile_->GetRequestContext(), |
207 GetPopularSitesCountry(), | 210 GetPopularSitesCountry(), |
208 GetPopularSitesVersion(), | 211 GetPopularSitesVersion(), |
209 false, | 212 false, |
210 base::Bind(&MostVisitedSites::OnPopularSitesAvailable, | 213 base::Bind(&MostVisitedSites::OnPopularSitesAvailable, |
211 base::Unretained(this)))); | 214 base::Unretained(this)))); |
212 } else { | 215 } else { |
213 received_popular_sites_ = true; | 216 received_popular_sites_ = true; |
214 } | 217 } |
215 | 218 |
216 scoped_refptr<TopSites> top_sites = TopSitesFactory::GetForProfile(profile_); | 219 scoped_refptr<TopSites> top_sites = TopSitesFactory::GetForProfile(profile_); |
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
786 | 789 |
787 void MostVisitedSites::TopSitesLoaded(TopSites* top_sites) {} | 790 void MostVisitedSites::TopSitesLoaded(TopSites* top_sites) {} |
788 | 791 |
789 void MostVisitedSites::TopSitesChanged(TopSites* top_sites, | 792 void MostVisitedSites::TopSitesChanged(TopSites* top_sites, |
790 ChangeReason change_reason) { | 793 ChangeReason change_reason) { |
791 if (mv_source_ == TOP_SITES) { | 794 if (mv_source_ == TOP_SITES) { |
792 // The displayed suggestions are invalidated. | 795 // The displayed suggestions are invalidated. |
793 InitiateTopSitesQuery(); | 796 InitiateTopSitesQuery(); |
794 } | 797 } |
795 } | 798 } |
OLD | NEW |