| 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 16 matching lines...) Expand all Loading... |
| 27 #include "components/ntp_tiles/popular_sites.h" | 27 #include "components/ntp_tiles/popular_sites.h" |
| 28 #include "components/safe_json/safe_json_parser.h" | 28 #include "components/safe_json/safe_json_parser.h" |
| 29 #include "content/public/browser/browser_thread.h" | 29 #include "content/public/browser/browser_thread.h" |
| 30 #include "content/public/browser/url_data_source.h" | 30 #include "content/public/browser/url_data_source.h" |
| 31 #include "jni/MostVisitedSites_jni.h" | 31 #include "jni/MostVisitedSites_jni.h" |
| 32 #include "ui/gfx/android/java_bitmap.h" | 32 #include "ui/gfx/android/java_bitmap.h" |
| 33 #include "url/gurl.h" | 33 #include "url/gurl.h" |
| 34 | 34 |
| 35 using base::android::AttachCurrentThread; | 35 using base::android::AttachCurrentThread; |
| 36 using base::android::ConvertJavaStringToUTF8; | 36 using base::android::ConvertJavaStringToUTF8; |
| 37 using base::android::JavaParamRef; |
| 37 using base::android::ScopedJavaGlobalRef; | 38 using base::android::ScopedJavaGlobalRef; |
| 38 using base::android::ScopedJavaLocalRef; | 39 using base::android::ScopedJavaLocalRef; |
| 39 using base::android::ToJavaArrayOfStrings; | 40 using base::android::ToJavaArrayOfStrings; |
| 40 using base::android::ToJavaIntArray; | 41 using base::android::ToJavaIntArray; |
| 41 using content::BrowserThread; | 42 using content::BrowserThread; |
| 42 using ntp_tiles::MostVisitedSites; | 43 using ntp_tiles::MostVisitedSites; |
| 43 using ntp_tiles::MostVisitedSitesSupervisor; | 44 using ntp_tiles::MostVisitedSitesSupervisor; |
| 44 using suggestions::SuggestionsServiceFactory; | 45 using suggestions::SuggestionsServiceFactory; |
| 45 | 46 |
| 46 MostVisitedSitesBridge::SupervisorBridge::SupervisorBridge(Profile* profile) | 47 MostVisitedSitesBridge::SupervisorBridge::SupervisorBridge(Profile* profile) |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 } | 229 } |
| 229 | 230 |
| 230 static jlong Init(JNIEnv* env, | 231 static jlong Init(JNIEnv* env, |
| 231 const JavaParamRef<jobject>& obj, | 232 const JavaParamRef<jobject>& obj, |
| 232 const JavaParamRef<jobject>& jprofile) { | 233 const JavaParamRef<jobject>& jprofile) { |
| 233 MostVisitedSitesBridge* most_visited_sites = | 234 MostVisitedSitesBridge* most_visited_sites = |
| 234 new MostVisitedSitesBridge( | 235 new MostVisitedSitesBridge( |
| 235 ProfileAndroid::FromProfileAndroid(jprofile)); | 236 ProfileAndroid::FromProfileAndroid(jprofile)); |
| 236 return reinterpret_cast<intptr_t>(most_visited_sites); | 237 return reinterpret_cast<intptr_t>(most_visited_sites); |
| 237 } | 238 } |
| OLD | NEW |