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

Side by Side Diff: chrome/browser/android/preferences/pref_service_bridge.cc

Issue 2096363003: [ImportantSites] Adding usage metrics. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments & test fix Created 4 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/preferences/pref_service_bridge.h" 5 #include "chrome/browser/android/preferences/pref_service_bridge.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 using base::android::AttachCurrentThread; 65 using base::android::AttachCurrentThread;
66 using base::android::CheckException; 66 using base::android::CheckException;
67 using base::android::ConvertJavaStringToUTF8; 67 using base::android::ConvertJavaStringToUTF8;
68 using base::android::ConvertUTF8ToJavaString; 68 using base::android::ConvertUTF8ToJavaString;
69 using base::android::ScopedJavaLocalRef; 69 using base::android::ScopedJavaLocalRef;
70 using base::android::ScopedJavaGlobalRef; 70 using base::android::ScopedJavaGlobalRef;
71 using content::BrowserThread; 71 using content::BrowserThread;
72 72
73 namespace { 73 namespace {
74
75 // This should never change, as it's used for UMA metrics.
Mark P 2016/06/30 05:29:09 You don't need this warning. The problem I envisi
dmurph 2016/06/30 20:16:29 Ah, ok.
74 const size_t kMaxImportantSites = 5; 76 const size_t kMaxImportantSites = 5;
75 77
76 Profile* GetOriginalProfile() { 78 Profile* GetOriginalProfile() {
77 return ProfileManager::GetActiveUserProfile()->GetOriginalProfile(); 79 return ProfileManager::GetActiveUserProfile()->GetOriginalProfile();
78 } 80 }
79 81
80 bool GetBooleanForContentSetting(ContentSettingsType type) { 82 bool GetBooleanForContentSetting(ContentSettingsType type) {
81 HostContentSettingsMap* content_settings = 83 HostContentSettingsMap* content_settings =
82 HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile()); 84 HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
83 switch (content_settings->GetDefaultContentSetting(type, NULL)) { 85 switch (content_settings->GetDefaultContentSetting(type, NULL)) {
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 std::transform(example_origins.begin(), example_origins.end(), 678 std::transform(example_origins.begin(), example_origins.end(),
677 important_domains.begin(), 679 important_domains.begin(),
678 [](const GURL& origin) { return origin.spec(); }); 680 [](const GURL& origin) { return origin.spec(); });
679 ScopedJavaLocalRef<jobjectArray> java_origins = 681 ScopedJavaLocalRef<jobjectArray> java_origins =
680 base::android::ToJavaArrayOfStrings(env, important_domains); 682 base::android::ToJavaArrayOfStrings(env, important_domains);
681 683
682 Java_ImportantSitesCallback_onImportantRegisterableDomainsReady( 684 Java_ImportantSitesCallback_onImportantRegisterableDomainsReady(
683 env, java_callback.obj(), java_domains.obj(), java_origins.obj()); 685 env, java_callback.obj(), java_domains.obj(), java_origins.obj());
684 } 686 }
685 687
688 // This should never return a different constant, as it's used for UMA metrics.
Mark P 2016/06/30 05:29:09 more correct: // This value should no change durin
dmurph 2016/06/30 20:16:29 Done.
686 static jint GetMaxImportantSites(JNIEnv* env, 689 static jint GetMaxImportantSites(JNIEnv* env,
687 const JavaParamRef<jclass>& clazz) { 690 const JavaParamRef<jclass>& clazz) {
688 return kMaxImportantSites; 691 return kMaxImportantSites;
689 } 692 }
690 693
691 static void MarkOriginAsImportantForTesting( 694 static void MarkOriginAsImportantForTesting(
692 JNIEnv* env, 695 JNIEnv* env,
693 const JavaParamRef<jclass>& clazz, 696 const JavaParamRef<jclass>& clazz,
694 const JavaParamRef<jstring>& jorigin) { 697 const JavaParamRef<jstring>& jorigin) {
695 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin)); 698 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin));
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
1184 1187
1185 return ConvertJavaStringToUTF8(android_permission); 1188 return ConvertJavaStringToUTF8(android_permission);
1186 } 1189 }
1187 1190
1188 static void SetSupervisedUserId(JNIEnv* env, 1191 static void SetSupervisedUserId(JNIEnv* env,
1189 const JavaParamRef<jobject>& obj, 1192 const JavaParamRef<jobject>& obj,
1190 const JavaParamRef<jstring>& pref) { 1193 const JavaParamRef<jstring>& pref) {
1191 GetPrefService()->SetString(prefs::kSupervisedUserId, 1194 GetPrefService()->SetString(prefs::kSupervisedUserId,
1192 ConvertJavaStringToUTF8(env, pref)); 1195 ConvertJavaStringToUTF8(env, pref));
1193 } 1196 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698