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/search/instant_service.h" | 5 #include "chrome/browser/search/instant_service.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
11 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
12 #include "chrome/browser/history/history_notifications.h" | 12 #include "chrome/browser/history/history_notifications.h" |
| 13 #include "chrome/browser/history/most_visited_tiles_experiment.h" |
13 #include "chrome/browser/history/top_sites.h" | 14 #include "chrome/browser/history/top_sites.h" |
14 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/search/instant_io_context.h" | 16 #include "chrome/browser/search/instant_io_context.h" |
16 #include "chrome/browser/search/instant_service_factory.h" | 17 #include "chrome/browser/search/instant_service_factory.h" |
17 #include "chrome/browser/search/instant_service_observer.h" | 18 #include "chrome/browser/search/instant_service_observer.h" |
18 #include "chrome/browser/search/local_ntp_source.h" | 19 #include "chrome/browser/search/local_ntp_source.h" |
19 #include "chrome/browser/search/most_visited_iframe_source.h" | 20 #include "chrome/browser/search/most_visited_iframe_source.h" |
20 #include "chrome/browser/search/search.h" | 21 #include "chrome/browser/search/search.h" |
21 #include "chrome/browser/themes/theme_properties.h" | 22 #include "chrome/browser/themes/theme_properties.h" |
22 #include "chrome/browser/themes/theme_service.h" | 23 #include "chrome/browser/themes/theme_service.h" |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 } | 210 } |
210 #endif // defined(ENABLE_THEMES) | 211 #endif // defined(ENABLE_THEMES) |
211 default: | 212 default: |
212 NOTREACHED() << "Unexpected notification type in InstantService."; | 213 NOTREACHED() << "Unexpected notification type in InstantService."; |
213 } | 214 } |
214 } | 215 } |
215 | 216 |
216 void InstantService::OnMostVisitedItemsReceived( | 217 void InstantService::OnMostVisitedItemsReceived( |
217 const history::MostVisitedURLList& data) { | 218 const history::MostVisitedURLList& data) { |
218 history::MostVisitedURLList reordered_data(data); | 219 history::MostVisitedURLList reordered_data(data); |
219 history::TopSites::MaybeShuffle(&reordered_data); | 220 history::MostVisitedTilesExperiment::MaybeShuffle(&reordered_data); |
220 | 221 |
221 std::vector<InstantMostVisitedItem> new_most_visited_items; | 222 std::vector<InstantMostVisitedItem> new_most_visited_items; |
222 for (size_t i = 0; i < reordered_data.size(); i++) { | 223 for (size_t i = 0; i < reordered_data.size(); i++) { |
223 const history::MostVisitedURL& url = reordered_data[i]; | 224 const history::MostVisitedURL& url = reordered_data[i]; |
224 InstantMostVisitedItem item; | 225 InstantMostVisitedItem item; |
225 item.url = url.url; | 226 item.url = url.url; |
226 item.title = url.title; | 227 item.title = url.title; |
227 new_most_visited_items.push_back(item); | 228 new_most_visited_items.push_back(item); |
228 } | 229 } |
229 | 230 |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 DCHECK(image); | 342 DCHECK(image); |
342 theme_info_->image_height = image->height(); | 343 theme_info_->image_height = image->height(); |
343 | 344 |
344 theme_info_->has_attribution = | 345 theme_info_->has_attribution = |
345 theme_service->HasCustomImage(IDR_THEME_NTP_ATTRIBUTION); | 346 theme_service->HasCustomImage(IDR_THEME_NTP_ATTRIBUTION); |
346 } | 347 } |
347 | 348 |
348 FOR_EACH_OBSERVER(InstantServiceObserver, observers_, | 349 FOR_EACH_OBSERVER(InstantServiceObserver, observers_, |
349 ThemeInfoChanged(*theme_info_)); | 350 ThemeInfoChanged(*theme_info_)); |
350 } | 351 } |
OLD | NEW |