| 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_bridge.h" | 5 #include "chrome/browser/android/ntp/most_visited_sites_bridge.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 urls.reserve(tiles.size()); | 126 urls.reserve(tiles.size()); |
| 127 whitelist_icon_paths.reserve(tiles.size()); | 127 whitelist_icon_paths.reserve(tiles.size()); |
| 128 sources.reserve(tiles.size()); | 128 sources.reserve(tiles.size()); |
| 129 for (const auto& tile : tiles) { | 129 for (const auto& tile : tiles) { |
| 130 titles.emplace_back(tile.title); | 130 titles.emplace_back(tile.title); |
| 131 urls.emplace_back(tile.url.spec()); | 131 urls.emplace_back(tile.url.spec()); |
| 132 whitelist_icon_paths.emplace_back(tile.whitelist_icon_path.value()); | 132 whitelist_icon_paths.emplace_back(tile.whitelist_icon_path.value()); |
| 133 sources.emplace_back(static_cast<int>(tile.source)); | 133 sources.emplace_back(static_cast<int>(tile.source)); |
| 134 } | 134 } |
| 135 Java_MostVisitedURLsObserver_onMostVisitedURLsAvailable( | 135 Java_MostVisitedURLsObserver_onMostVisitedURLsAvailable( |
| 136 env, observer_.obj(), ToJavaArrayOfStrings(env, titles).obj(), | 136 env, observer_, ToJavaArrayOfStrings(env, titles), |
| 137 ToJavaArrayOfStrings(env, urls).obj(), | 137 ToJavaArrayOfStrings(env, urls), |
| 138 ToJavaArrayOfStrings(env, whitelist_icon_paths).obj(), | 138 ToJavaArrayOfStrings(env, whitelist_icon_paths), |
| 139 ToJavaIntArray(env, sources).obj()); | 139 ToJavaIntArray(env, sources)); |
| 140 } | 140 } |
| 141 | 141 |
| 142 void MostVisitedSitesBridge::JavaObserver::OnPopularURLsAvailable( | 142 void MostVisitedSitesBridge::JavaObserver::OnPopularURLsAvailable( |
| 143 const MostVisitedSites::PopularSitesVector& sites) { | 143 const MostVisitedSites::PopularSitesVector& sites) { |
| 144 JNIEnv* env = AttachCurrentThread(); | 144 JNIEnv* env = AttachCurrentThread(); |
| 145 std::vector<std::string> urls; | 145 std::vector<std::string> urls; |
| 146 std::vector<std::string> favicon_urls; | 146 std::vector<std::string> favicon_urls; |
| 147 std::vector<std::string> large_icon_urls; | 147 std::vector<std::string> large_icon_urls; |
| 148 for (const auto& site : sites) { | 148 for (const auto& site : sites) { |
| 149 urls.emplace_back(site.url.spec()); | 149 urls.emplace_back(site.url.spec()); |
| 150 favicon_urls.emplace_back(site.favicon_url.spec()); | 150 favicon_urls.emplace_back(site.favicon_url.spec()); |
| 151 large_icon_urls.emplace_back(site.large_icon_url.spec()); | 151 large_icon_urls.emplace_back(site.large_icon_url.spec()); |
| 152 } | 152 } |
| 153 Java_MostVisitedURLsObserver_onPopularURLsAvailable( | 153 Java_MostVisitedURLsObserver_onPopularURLsAvailable( |
| 154 env, observer_.obj(), ToJavaArrayOfStrings(env, urls).obj(), | 154 env, observer_, ToJavaArrayOfStrings(env, urls), |
| 155 ToJavaArrayOfStrings(env, favicon_urls).obj(), | 155 ToJavaArrayOfStrings(env, favicon_urls), |
| 156 ToJavaArrayOfStrings(env, large_icon_urls).obj()); | 156 ToJavaArrayOfStrings(env, large_icon_urls)); |
| 157 } | 157 } |
| 158 | 158 |
| 159 MostVisitedSitesBridge::MostVisitedSitesBridge(Profile* profile) | 159 MostVisitedSitesBridge::MostVisitedSitesBridge(Profile* profile) |
| 160 : supervisor_(profile), | 160 : supervisor_(profile), |
| 161 popular_sites_(BrowserThread::GetBlockingPool(), | 161 popular_sites_(BrowserThread::GetBlockingPool(), |
| 162 profile->GetPrefs(), | 162 profile->GetPrefs(), |
| 163 TemplateURLServiceFactory::GetForProfile(profile), | 163 TemplateURLServiceFactory::GetForProfile(profile), |
| 164 g_browser_process->variations_service(), | 164 g_browser_process->variations_service(), |
| 165 profile->GetRequestContext(), | 165 profile->GetRequestContext(), |
| 166 ChromePopularSites::GetDirectory(), | 166 ChromePopularSites::GetDirectory(), |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 } | 229 } |
| 230 | 230 |
| 231 static jlong Init(JNIEnv* env, | 231 static jlong Init(JNIEnv* env, |
| 232 const JavaParamRef<jobject>& obj, | 232 const JavaParamRef<jobject>& obj, |
| 233 const JavaParamRef<jobject>& jprofile) { | 233 const JavaParamRef<jobject>& jprofile) { |
| 234 MostVisitedSitesBridge* most_visited_sites = | 234 MostVisitedSitesBridge* most_visited_sites = |
| 235 new MostVisitedSitesBridge( | 235 new MostVisitedSitesBridge( |
| 236 ProfileAndroid::FromProfileAndroid(jprofile)); | 236 ProfileAndroid::FromProfileAndroid(jprofile)); |
| 237 return reinterpret_cast<intptr_t>(most_visited_sites); | 237 return reinterpret_cast<intptr_t>(most_visited_sites); |
| 238 } | 238 } |
| OLD | NEW |