OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/sync/profile_sync_service_android.h" | 5 #include "chrome/browser/sync/profile_sync_service_android.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "chrome/browser/signin/signin_manager_factory.h" | 24 #include "chrome/browser/signin/signin_manager_factory.h" |
25 #include "chrome/browser/sync/profile_sync_service_factory.h" | 25 #include "chrome/browser/sync/profile_sync_service_factory.h" |
26 #include "chrome/browser/sync/sync_ui_util.h" | 26 #include "chrome/browser/sync/sync_ui_util.h" |
27 #include "chrome/common/channel_info.h" | 27 #include "chrome/common/channel_info.h" |
28 #include "chrome/grit/generated_resources.h" | 28 #include "chrome/grit/generated_resources.h" |
29 #include "components/browser_sync/profile_sync_service.h" | 29 #include "components/browser_sync/profile_sync_service.h" |
30 #include "components/prefs/pref_service.h" | 30 #include "components/prefs/pref_service.h" |
31 #include "components/signin/core/browser/signin_manager.h" | 31 #include "components/signin/core/browser/signin_manager.h" |
32 #include "components/strings/grit/components_strings.h" | 32 #include "components/strings/grit/components_strings.h" |
33 #include "components/sync/base/pref_names.h" | 33 #include "components/sync/base/pref_names.h" |
34 #include "components/sync/core/read_transaction.h" | |
35 #include "components/sync/driver/about_sync_util.h" | 34 #include "components/sync/driver/about_sync_util.h" |
36 #include "components/sync/engine/net/network_resources.h" | 35 #include "components/sync/engine/net/network_resources.h" |
| 36 #include "components/sync/syncable/read_transaction.h" |
37 #include "content/public/browser/browser_thread.h" | 37 #include "content/public/browser/browser_thread.h" |
38 #include "google/cacheinvalidation/types.pb.h" | 38 #include "google/cacheinvalidation/types.pb.h" |
39 #include "google_apis/gaia/gaia_constants.h" | 39 #include "google_apis/gaia/gaia_constants.h" |
40 #include "jni/ProfileSyncService_jni.h" | 40 #include "jni/ProfileSyncService_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 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
512 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 512 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
513 ProfileSyncServiceAndroid* profile_sync_service_android = | 513 ProfileSyncServiceAndroid* profile_sync_service_android = |
514 new ProfileSyncServiceAndroid(env, obj); | 514 new ProfileSyncServiceAndroid(env, obj); |
515 if (profile_sync_service_android->Init()) { | 515 if (profile_sync_service_android->Init()) { |
516 return reinterpret_cast<intptr_t>(profile_sync_service_android); | 516 return reinterpret_cast<intptr_t>(profile_sync_service_android); |
517 } else { | 517 } else { |
518 delete profile_sync_service_android; | 518 delete profile_sync_service_android; |
519 return 0; | 519 return 0; |
520 } | 520 } |
521 } | 521 } |
OLD | NEW |