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 | 8 |
9 #include "base/android/build_info.h" | 9 #include "base/android/build_info.h" |
10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
11 #include "base/android/jni_string.h" | 11 #include "base/android/jni_string.h" |
12 #include "base/android/jni_weak_ref.h" | 12 #include "base/android/jni_weak_ref.h" |
13 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
14 #include "base/files/file_util.h" | 14 #include "base/files/file_util.h" |
15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
16 #include "base/prefs/pref_service.h" | 16 #include "base/prefs/pref_service.h" |
17 #include "base/strings/string_util.h" | 17 #include "base/strings/string_util.h" |
18 #include "base/values.h" | 18 #include "base/values.h" |
19 #include "chrome/browser/browser_process.h" | 19 #include "chrome/browser/browser_process.h" |
20 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 20 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
21 #include "chrome/browser/browsing_data/browsing_data_remover.h" | 21 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
22 #include "chrome/browser/net/prediction_options.h" | 22 #include "chrome/browser/net/prediction_options.h" |
23 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 23 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
24 #include "chrome/browser/profiles/profile_manager.h" | 24 #include "chrome/browser/profiles/profile_manager.h" |
25 #include "chrome/browser/translate/chrome_translate_client.h" | 25 #include "chrome/browser/translate/chrome_translate_client.h" |
26 #include "chrome/browser/ui/android/android_about_app_info.h" | 26 #include "chrome/browser/ui/android/android_about_app_info.h" |
27 #include "chrome/common/chrome_version_info.h" | |
28 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
29 #include "chrome/grit/locale_settings.h" | 28 #include "chrome/grit/locale_settings.h" |
30 #include "components/content_settings/core/browser/host_content_settings_map.h" | 29 #include "components/content_settings/core/browser/host_content_settings_map.h" |
31 #include "components/content_settings/core/common/content_settings.h" | 30 #include "components/content_settings/core/common/content_settings.h" |
32 #include "components/content_settings/core/common/content_settings_pattern.h" | 31 #include "components/content_settings/core/common/content_settings_pattern.h" |
33 #include "components/content_settings/core/common/pref_names.h" | 32 #include "components/content_settings/core/common/pref_names.h" |
34 #include "components/password_manager/core/common/password_manager_pref_names.h" | 33 #include "components/password_manager/core/common/password_manager_pref_names.h" |
35 #include "components/translate/core/browser/translate_prefs.h" | 34 #include "components/translate/core/browser/translate_prefs.h" |
36 #include "components/translate/core/common/translate_pref_names.h" | 35 #include "components/translate/core/common/translate_pref_names.h" |
| 36 #include "components/version_info/version_info.h" |
37 #include "components/web_resource/web_resource_pref_names.h" | 37 #include "components/web_resource/web_resource_pref_names.h" |
38 #include "content/public/browser/browser_thread.h" | 38 #include "content/public/browser/browser_thread.h" |
39 #include "content/public/browser/user_metrics.h" | 39 #include "content/public/browser/user_metrics.h" |
40 #include "jni/PrefServiceBridge_jni.h" | 40 #include "jni/PrefServiceBridge_jni.h" |
41 #include "ui/base/l10n/l10n_util.h" | 41 #include "ui/base/l10n/l10n_util.h" |
42 | 42 |
43 using base::android::AttachCurrentThread; | 43 using base::android::AttachCurrentThread; |
44 using base::android::CheckException; | 44 using base::android::CheckException; |
45 using base::android::ConvertJavaStringToUTF8; | 45 using base::android::ConvertJavaStringToUTF8; |
46 using base::android::ConvertUTF8ToJavaString; | 46 using base::android::ConvertUTF8ToJavaString; |
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
734 std::string locale_string(ConvertJavaStringToUTF8(env, default_locale)); | 734 std::string locale_string(ConvertJavaStringToUTF8(env, default_locale)); |
735 | 735 |
736 PrefServiceBridge::PrependToAcceptLanguagesIfNecessary(locale_string, | 736 PrefServiceBridge::PrependToAcceptLanguagesIfNecessary(locale_string, |
737 &accept_languages); | 737 &accept_languages); |
738 GetPrefService()->SetString(prefs::kAcceptLanguages, accept_languages); | 738 GetPrefService()->SetString(prefs::kAcceptLanguages, accept_languages); |
739 } | 739 } |
740 | 740 |
741 // Sends all information about the different versions to Java. | 741 // Sends all information about the different versions to Java. |
742 // From browser_about_handler.cc | 742 // From browser_about_handler.cc |
743 static jobject GetAboutVersionStrings(JNIEnv* env, jobject obj) { | 743 static jobject GetAboutVersionStrings(JNIEnv* env, jobject obj) { |
744 chrome::VersionInfo version_info; | 744 std::string os_version = version_info::GetOSType(); |
745 std::string os_version = version_info.OSType(); | |
746 os_version += " " + AndroidAboutAppInfo::GetOsInfo(); | 745 os_version += " " + AndroidAboutAppInfo::GetOsInfo(); |
747 | 746 |
748 base::android::BuildInfo* android_build_info = | 747 base::android::BuildInfo* android_build_info = |
749 base::android::BuildInfo::GetInstance(); | 748 base::android::BuildInfo::GetInstance(); |
750 std::string application(android_build_info->package_label()); | 749 std::string application(android_build_info->package_label()); |
751 application.append(" "); | 750 application.append(" "); |
752 application.append(version_info.Version()); | 751 application.append(version_info::GetVersionNumber()); |
753 | 752 |
754 // OK to release, returning to Java. | 753 // OK to release, returning to Java. |
755 return Java_PrefServiceBridge_createAboutVersionStrings( | 754 return Java_PrefServiceBridge_createAboutVersionStrings( |
756 env, | 755 env, |
757 ConvertUTF8ToJavaString(env, application).obj(), | 756 ConvertUTF8ToJavaString(env, application).obj(), |
758 ConvertUTF8ToJavaString(env, os_version).obj()).Release(); | 757 ConvertUTF8ToJavaString(env, os_version).obj()).Release(); |
759 } | 758 } |
760 | 759 |
761 static jstring GetSupervisedUserCustodianName(JNIEnv* env, jobject obj) { | 760 static jstring GetSupervisedUserCustodianName(JNIEnv* env, jobject obj) { |
762 return ConvertUTF8ToJavaString( | 761 return ConvertUTF8ToJavaString( |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
846 ContentSettingsType content_type) { | 845 ContentSettingsType content_type) { |
847 JNIEnv* env = AttachCurrentThread(); | 846 JNIEnv* env = AttachCurrentThread(); |
848 base::android::ScopedJavaLocalRef<jstring> android_permission = | 847 base::android::ScopedJavaLocalRef<jstring> android_permission = |
849 Java_PrefServiceBridge_getAndroidPermissionForContentSetting( | 848 Java_PrefServiceBridge_getAndroidPermissionForContentSetting( |
850 env, content_type); | 849 env, content_type); |
851 if (android_permission.is_null()) | 850 if (android_permission.is_null()) |
852 return std::string(); | 851 return std::string(); |
853 | 852 |
854 return ConvertJavaStringToUTF8(android_permission); | 853 return ConvertJavaStringToUTF8(android_permission); |
855 } | 854 } |
OLD | NEW |