Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: chrome/browser/android/ntp/most_visited_sites_bridge.cc

Issue 2332353006: Use NTPTileSource in MVS interface. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 24 matching lines...) Expand all
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::JavaParamRef;
38 using base::android::ScopedJavaGlobalRef; 38 using base::android::ScopedJavaGlobalRef;
39 using base::android::ScopedJavaLocalRef; 39 using base::android::ScopedJavaLocalRef;
40 using base::android::ToJavaArrayOfStrings; 40 using base::android::ToJavaArrayOfStrings;
41 using base::android::ToJavaIntArray; 41 using base::android::ToJavaIntArray;
42 using content::BrowserThread; 42 using content::BrowserThread;
43 using ntp_tiles::MostVisitedSites; 43 using ntp_tiles::MostVisitedSites;
44 using ntp_tiles::MostVisitedSitesSupervisor; 44 using ntp_tiles::MostVisitedSitesSupervisor;
45 using ntp_tiles::NTPTileSource;
45 using suggestions::SuggestionsServiceFactory; 46 using suggestions::SuggestionsServiceFactory;
46 47
47 MostVisitedSitesBridge::SupervisorBridge::SupervisorBridge(Profile* profile) 48 MostVisitedSitesBridge::SupervisorBridge::SupervisorBridge(Profile* profile)
48 : profile_(profile), 49 : profile_(profile),
49 supervisor_observer_(nullptr), 50 supervisor_observer_(nullptr),
50 register_observer_(this) { 51 register_observer_(this) {
51 register_observer_.Add(SupervisedUserServiceFactory::GetForProfile(profile_)); 52 register_observer_.Add(SupervisedUserServiceFactory::GetForProfile(profile_));
52 } 53 }
53 54
54 MostVisitedSitesBridge::SupervisorBridge::~SupervisorBridge() {} 55 MostVisitedSitesBridge::SupervisorBridge::~SupervisorBridge() {}
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 GURL url(ConvertJavaStringToUTF8(env, j_url)); 200 GURL url(ConvertJavaStringToUTF8(env, j_url));
200 most_visited_.AddOrRemoveBlacklistedUrl(url, add_url); 201 most_visited_.AddOrRemoveBlacklistedUrl(url, add_url);
201 } 202 }
202 203
203 void MostVisitedSitesBridge::RecordTileTypeMetrics( 204 void MostVisitedSitesBridge::RecordTileTypeMetrics(
204 JNIEnv* env, 205 JNIEnv* env,
205 const JavaParamRef<jobject>& obj, 206 const JavaParamRef<jobject>& obj,
206 const JavaParamRef<jintArray>& jtile_types, 207 const JavaParamRef<jintArray>& jtile_types,
207 const JavaParamRef<jintArray>& jsources) { 208 const JavaParamRef<jintArray>& jsources) {
208 std::vector<int> tile_types; 209 std::vector<int> tile_types;
209 std::vector<int> sources;
210
211 base::android::JavaIntArrayToIntVector(env, jtile_types, &tile_types); 210 base::android::JavaIntArrayToIntVector(env, jtile_types, &tile_types);
212 base::android::JavaIntArrayToIntVector(env, jsources, &sources); 211 std::vector<int> int_sources;
212 base::android::JavaIntArrayToIntVector(env, jsources, &int_sources);
213 std::vector<NTPTileSource> sources;
214 for (int source : int_sources) {
215 sources.push_back(static_cast<ntp_tiles::NTPTileSource>(source));
216 }
213 217
214 most_visited_.RecordTileTypeMetrics(tile_types, sources); 218 most_visited_.RecordTileTypeMetrics(tile_types, sources);
215 } 219 }
216 220
217 void MostVisitedSitesBridge::RecordOpenedMostVisitedItem( 221 void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
218 JNIEnv* env, 222 JNIEnv* env,
219 const JavaParamRef<jobject>& obj, 223 const JavaParamRef<jobject>& obj,
220 jint index, 224 jint index,
221 jint tile_type, 225 jint tile_type,
222 jint source) { 226 jint source) {
223 most_visited_.RecordOpenedMostVisitedItem(index, tile_type, source); 227 most_visited_.RecordOpenedMostVisitedItem(
228 index, tile_type, static_cast<ntp_tiles::NTPTileSource>(source));
224 } 229 }
225 230
226 // static 231 // static
227 bool MostVisitedSitesBridge::Register(JNIEnv* env) { 232 bool MostVisitedSitesBridge::Register(JNIEnv* env) {
228 return RegisterNativesImpl(env); 233 return RegisterNativesImpl(env);
229 } 234 }
230 235
231 static jlong Init(JNIEnv* env, 236 static jlong Init(JNIEnv* env,
232 const JavaParamRef<jobject>& obj, 237 const JavaParamRef<jobject>& obj,
233 const JavaParamRef<jobject>& jprofile) { 238 const JavaParamRef<jobject>& jprofile) {
234 MostVisitedSitesBridge* most_visited_sites = 239 MostVisitedSitesBridge* most_visited_sites =
235 new MostVisitedSitesBridge( 240 new MostVisitedSitesBridge(
236 ProfileAndroid::FromProfileAndroid(jprofile)); 241 ProfileAndroid::FromProfileAndroid(jprofile));
237 return reinterpret_cast<intptr_t>(most_visited_sites); 242 return reinterpret_cast<intptr_t>(most_visited_sites);
238 } 243 }
OLDNEW
« no previous file with comments | « no previous file | components/ntp_tiles/most_visited_sites.h » ('j') | components/ntp_tiles/most_visited_sites.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698