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 <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 19 matching lines...) Expand all Loading... |
30 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" | 30 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" |
31 #include "chrome/browser/browsing_data/registrable_domain_filter_builder.h" | 31 #include "chrome/browser/browsing_data/registrable_domain_filter_builder.h" |
32 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 32 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
33 #include "chrome/browser/history/web_history_service_factory.h" | 33 #include "chrome/browser/history/web_history_service_factory.h" |
34 #include "chrome/browser/net/prediction_options.h" | 34 #include "chrome/browser/net/prediction_options.h" |
35 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 35 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
36 #include "chrome/browser/profiles/profile_manager.h" | 36 #include "chrome/browser/profiles/profile_manager.h" |
37 #include "chrome/browser/sync/profile_sync_service_factory.h" | 37 #include "chrome/browser/sync/profile_sync_service_factory.h" |
38 #include "chrome/browser/translate/chrome_translate_client.h" | 38 #include "chrome/browser/translate/chrome_translate_client.h" |
39 #include "chrome/browser/ui/android/android_about_app_info.h" | 39 #include "chrome/browser/ui/android/android_about_app_info.h" |
| 40 #include "chrome/common/channel_info.h" |
| 41 #include "chrome/common/chrome_content_client.h" |
40 #include "chrome/common/pref_names.h" | 42 #include "chrome/common/pref_names.h" |
41 #include "chrome/grit/locale_settings.h" | 43 #include "chrome/grit/locale_settings.h" |
42 #include "components/browsing_data_ui/history_notice_utils.h" | 44 #include "components/browsing_data_ui/history_notice_utils.h" |
43 #include "components/content_settings/core/browser/host_content_settings_map.h" | 45 #include "components/content_settings/core/browser/host_content_settings_map.h" |
44 #include "components/content_settings/core/common/content_settings.h" | 46 #include "components/content_settings/core/common/content_settings.h" |
45 #include "components/content_settings/core/common/content_settings_pattern.h" | 47 #include "components/content_settings/core/common/content_settings_pattern.h" |
46 #include "components/content_settings/core/common/pref_names.h" | 48 #include "components/content_settings/core/common/pref_names.h" |
47 #include "components/metrics/metrics_pref_names.h" | 49 #include "components/metrics/metrics_pref_names.h" |
48 #include "components/password_manager/core/common/password_manager_pref_names.h" | 50 #include "components/password_manager/core/common/password_manager_pref_names.h" |
49 #include "components/prefs/pref_service.h" | 51 #include "components/prefs/pref_service.h" |
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
689 browsing_data_ui::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory( | 691 browsing_data_ui::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory( |
690 ProfileSyncServiceFactory::GetForProfile(GetOriginalProfile()), | 692 ProfileSyncServiceFactory::GetForProfile(GetOriginalProfile()), |
691 WebHistoryServiceFactory::GetForProfile(GetOriginalProfile()), | 693 WebHistoryServiceFactory::GetForProfile(GetOriginalProfile()), |
692 base::Bind(&ShowNoticeAboutOtherFormsOfBrowsingHistory, | 694 base::Bind(&ShowNoticeAboutOtherFormsOfBrowsingHistory, |
693 base::Owned(new ScopedJavaGlobalRef<jobject>(env, listener)))); | 695 base::Owned(new ScopedJavaGlobalRef<jobject>(env, listener)))); |
694 | 696 |
695 // The one-time notice in the dialog. | 697 // The one-time notice in the dialog. |
696 browsing_data_ui::ShouldPopupDialogAboutOtherFormsOfBrowsingHistory( | 698 browsing_data_ui::ShouldPopupDialogAboutOtherFormsOfBrowsingHistory( |
697 ProfileSyncServiceFactory::GetForProfile(GetOriginalProfile()), | 699 ProfileSyncServiceFactory::GetForProfile(GetOriginalProfile()), |
698 WebHistoryServiceFactory::GetForProfile(GetOriginalProfile()), | 700 WebHistoryServiceFactory::GetForProfile(GetOriginalProfile()), |
| 701 chrome::GetChannel(), |
| 702 GetUserAgent(), |
699 base::Bind(&EnableDialogAboutOtherFormsOfBrowsingHistory, | 703 base::Bind(&EnableDialogAboutOtherFormsOfBrowsingHistory, |
700 base::Owned(new ScopedJavaGlobalRef<jobject>(env, listener)))); | 704 base::Owned(new ScopedJavaGlobalRef<jobject>(env, listener)))); |
701 } | 705 } |
702 | 706 |
703 static void SetAutoplayEnabled(JNIEnv* env, | 707 static void SetAutoplayEnabled(JNIEnv* env, |
704 const JavaParamRef<jobject>& obj, | 708 const JavaParamRef<jobject>& obj, |
705 jboolean allow) { | 709 jboolean allow) { |
706 HostContentSettingsMap* host_content_settings_map = | 710 HostContentSettingsMap* host_content_settings_map = |
707 HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile()); | 711 HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile()); |
708 host_content_settings_map->SetDefaultContentSetting( | 712 host_content_settings_map->SetDefaultContentSetting( |
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1132 | 1136 |
1133 return ConvertJavaStringToUTF8(android_permission); | 1137 return ConvertJavaStringToUTF8(android_permission); |
1134 } | 1138 } |
1135 | 1139 |
1136 static void SetSupervisedUserId(JNIEnv* env, | 1140 static void SetSupervisedUserId(JNIEnv* env, |
1137 const JavaParamRef<jobject>& obj, | 1141 const JavaParamRef<jobject>& obj, |
1138 const JavaParamRef<jstring>& pref) { | 1142 const JavaParamRef<jstring>& pref) { |
1139 GetPrefService()->SetString(prefs::kSupervisedUserId, | 1143 GetPrefService()->SetString(prefs::kSupervisedUserId, |
1140 ConvertJavaStringToUTF8(env, pref)); | 1144 ConvertJavaStringToUTF8(env, pref)); |
1141 } | 1145 } |
OLD | NEW |