OLD | NEW |
---|---|
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 <vector> | |
Alexei Svitkine (slow)
2015/11/04 16:47:23
Is this needed anymore?
| |
8 | 9 |
9 #include "base/android/build_info.h" | 10 #include "base/android/build_info.h" |
10 #include "base/android/jni_android.h" | 11 #include "base/android/jni_android.h" |
12 #include "base/android/jni_array.h" | |
Alexei Svitkine (slow)
2015/11/04 16:47:23
Is this needed anymore?
| |
11 #include "base/android/jni_string.h" | 13 #include "base/android/jni_string.h" |
12 #include "base/android/jni_weak_ref.h" | 14 #include "base/android/jni_weak_ref.h" |
15 #include "base/base64.h" | |
13 #include "base/files/file_path.h" | 16 #include "base/files/file_path.h" |
14 #include "base/files/file_util.h" | 17 #include "base/files/file_util.h" |
18 #include "base/logging.h" | |
15 #include "base/memory/scoped_ptr.h" | 19 #include "base/memory/scoped_ptr.h" |
16 #include "base/prefs/pref_service.h" | 20 #include "base/prefs/pref_service.h" |
17 #include "base/strings/string_util.h" | 21 #include "base/strings/string_util.h" |
18 #include "base/values.h" | 22 #include "base/values.h" |
19 #include "chrome/browser/browser_process.h" | 23 #include "chrome/browser/browser_process.h" |
20 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 24 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
21 #include "chrome/browser/browsing_data/browsing_data_remover.h" | 25 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
22 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 26 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
23 #include "chrome/browser/net/prediction_options.h" | 27 #include "chrome/browser/net/prediction_options.h" |
24 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 28 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
25 #include "chrome/browser/profiles/profile_manager.h" | 29 #include "chrome/browser/profiles/profile_manager.h" |
26 #include "chrome/browser/translate/chrome_translate_client.h" | 30 #include "chrome/browser/translate/chrome_translate_client.h" |
27 #include "chrome/browser/ui/android/android_about_app_info.h" | 31 #include "chrome/browser/ui/android/android_about_app_info.h" |
28 #include "chrome/common/pref_names.h" | 32 #include "chrome/common/pref_names.h" |
29 #include "chrome/grit/locale_settings.h" | 33 #include "chrome/grit/locale_settings.h" |
30 #include "components/content_settings/core/browser/host_content_settings_map.h" | 34 #include "components/content_settings/core/browser/host_content_settings_map.h" |
31 #include "components/content_settings/core/common/content_settings.h" | 35 #include "components/content_settings/core/common/content_settings.h" |
32 #include "components/content_settings/core/common/content_settings_pattern.h" | 36 #include "components/content_settings/core/common/content_settings_pattern.h" |
33 #include "components/content_settings/core/common/pref_names.h" | 37 #include "components/content_settings/core/common/pref_names.h" |
34 #include "components/metrics/metrics_pref_names.h" | 38 #include "components/metrics/metrics_pref_names.h" |
35 #include "components/password_manager/core/common/password_manager_pref_names.h" | 39 #include "components/password_manager/core/common/password_manager_pref_names.h" |
36 #include "components/signin/core/common/signin_pref_names.h" | 40 #include "components/signin/core/common/signin_pref_names.h" |
37 #include "components/translate/core/browser/translate_prefs.h" | 41 #include "components/translate/core/browser/translate_prefs.h" |
38 #include "components/translate/core/common/translate_pref_names.h" | 42 #include "components/translate/core/common/translate_pref_names.h" |
43 #include "components/variations/pref_names.h" | |
39 #include "components/version_info/version_info.h" | 44 #include "components/version_info/version_info.h" |
40 #include "components/web_resource/web_resource_pref_names.h" | 45 #include "components/web_resource/web_resource_pref_names.h" |
41 #include "content/public/browser/browser_thread.h" | 46 #include "content/public/browser/browser_thread.h" |
42 #include "content/public/browser/user_metrics.h" | 47 #include "content/public/browser/user_metrics.h" |
43 #include "jni/PrefServiceBridge_jni.h" | 48 #include "jni/PrefServiceBridge_jni.h" |
44 #include "ui/base/l10n/l10n_util.h" | 49 #include "ui/base/l10n/l10n_util.h" |
45 | 50 |
46 using base::android::AttachCurrentThread; | 51 using base::android::AttachCurrentThread; |
47 using base::android::CheckException; | 52 using base::android::CheckException; |
48 using base::android::ConvertJavaStringToUTF8; | 53 using base::android::ConvertJavaStringToUTF8; |
49 using base::android::ConvertUTF8ToJavaString; | 54 using base::android::ConvertUTF8ToJavaString; |
55 using base::android::GetApplicationContext; | |
50 using base::android::ScopedJavaLocalRef; | 56 using base::android::ScopedJavaLocalRef; |
51 using base::android::ScopedJavaGlobalRef; | 57 using base::android::ScopedJavaGlobalRef; |
52 using content::BrowserThread; | 58 using content::BrowserThread; |
53 | 59 |
54 namespace { | 60 namespace { |
55 | 61 |
56 enum NetworkPredictionOptions { | 62 enum NetworkPredictionOptions { |
57 NETWORK_PREDICTION_ALWAYS, | 63 NETWORK_PREDICTION_ALWAYS, |
58 NETWORK_PREDICTION_WIFI_ONLY, | 64 NETWORK_PREDICTION_WIFI_ONLY, |
59 NETWORK_PREDICTION_NEVER, | 65 NETWORK_PREDICTION_NEVER, |
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
941 ContentSettingsType content_type) { | 947 ContentSettingsType content_type) { |
942 JNIEnv* env = AttachCurrentThread(); | 948 JNIEnv* env = AttachCurrentThread(); |
943 base::android::ScopedJavaLocalRef<jstring> android_permission = | 949 base::android::ScopedJavaLocalRef<jstring> android_permission = |
944 Java_PrefServiceBridge_getAndroidPermissionForContentSetting( | 950 Java_PrefServiceBridge_getAndroidPermissionForContentSetting( |
945 env, content_type); | 951 env, content_type); |
946 if (android_permission.is_null()) | 952 if (android_permission.is_null()) |
947 return std::string(); | 953 return std::string(); |
948 | 954 |
949 return ConvertJavaStringToUTF8(android_permission); | 955 return ConvertJavaStringToUTF8(android_permission); |
950 } | 956 } |
957 | |
958 // static | |
959 void PrefServiceBridge::GetVariationsFirstRunSeed(std::string* seed_data, | |
960 std::string* seed_signature, | |
961 std::string* seed_country) { | |
962 JNIEnv* env = AttachCurrentThread(); | |
963 ScopedJavaLocalRef<jstring> j_seed_data = | |
964 Java_PrefServiceBridge_getVariationsFirstRunSeedData( | |
Alexei Svitkine (slow)
2015/11/04 16:47:23
Nit: Now that you're returning base64, please name
| |
965 env, GetApplicationContext()); | |
966 ScopedJavaLocalRef<jstring> j_seed_signature = | |
967 Java_PrefServiceBridge_getVariationsFirstRunSeedSignature( | |
968 env, GetApplicationContext()); | |
969 ScopedJavaLocalRef<jstring> j_seed_country = | |
970 Java_PrefServiceBridge_getVariationsFirstRunSeedCountry( | |
971 env, GetApplicationContext()); | |
972 // deserialize raw seed data. | |
Alexei Svitkine (slow)
2015/11/04 16:47:23
Nit: Capitalize
| |
973 base::Base64Decode(ConvertJavaStringToUTF8(j_seed_data), seed_data); | |
Alexei Svitkine (slow)
2015/11/04 16:47:23
Nit: This API could potentially fail. I think it s
| |
974 *seed_signature = ConvertJavaStringToUTF8(j_seed_signature); | |
975 *seed_country = ConvertJavaStringToUTF8(j_seed_country); | |
976 } | |
OLD | NEW |