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

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

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. 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 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 23 matching lines...) Expand all
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" 40 #include "chrome/common/channel_info.h"
41 #include "chrome/common/chrome_features.h" 41 #include "chrome/common/chrome_features.h"
42 #include "chrome/common/pref_names.h" 42 #include "chrome/common/pref_names.h"
43 #include "chrome/grit/locale_settings.h" 43 #include "chrome/grit/locale_settings.h"
44 #include "components/browser_sync/browser/profile_sync_service.h" 44 #include "components/browser_sync/profile_sync_service.h"
45 #include "components/browsing_data/core/browsing_data_utils.h" 45 #include "components/browsing_data/core/browsing_data_utils.h"
46 #include "components/browsing_data/core/pref_names.h" 46 #include "components/browsing_data/core/pref_names.h"
47 #include "components/browsing_data_ui/history_notice_utils.h" 47 #include "components/browsing_data_ui/history_notice_utils.h"
48 #include "components/content_settings/core/browser/host_content_settings_map.h" 48 #include "components/content_settings/core/browser/host_content_settings_map.h"
49 #include "components/content_settings/core/common/content_settings.h" 49 #include "components/content_settings/core/common/content_settings.h"
50 #include "components/content_settings/core/common/content_settings_pattern.h" 50 #include "components/content_settings/core/common/content_settings_pattern.h"
51 #include "components/content_settings/core/common/pref_names.h" 51 #include "components/content_settings/core/common/pref_names.h"
52 #include "components/metrics/metrics_pref_names.h" 52 #include "components/metrics/metrics_pref_names.h"
53 #include "components/password_manager/core/common/password_manager_pref_names.h" 53 #include "components/password_manager/core/common/password_manager_pref_names.h"
54 #include "components/prefs/pref_service.h" 54 #include "components/prefs/pref_service.h"
(...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1205 1205
1206 return ConvertJavaStringToUTF8(android_permission); 1206 return ConvertJavaStringToUTF8(android_permission);
1207 } 1207 }
1208 1208
1209 static void SetSupervisedUserId(JNIEnv* env, 1209 static void SetSupervisedUserId(JNIEnv* env,
1210 const JavaParamRef<jobject>& obj, 1210 const JavaParamRef<jobject>& obj,
1211 const JavaParamRef<jstring>& pref) { 1211 const JavaParamRef<jstring>& pref) {
1212 GetPrefService()->SetString(prefs::kSupervisedUserId, 1212 GetPrefService()->SetString(prefs::kSupervisedUserId,
1213 ConvertJavaStringToUTF8(env, pref)); 1213 ConvertJavaStringToUTF8(env, pref));
1214 } 1214 }
OLDNEW
« no previous file with comments | « chrome/browser/android/password_ui_view_android.cc ('k') | chrome/browser/app_controller_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698