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 "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/i18n/time_formatting.h" | 11 #include "base/i18n/time_formatting.h" |
12 #include "base/json/json_writer.h" | 12 #include "base/json/json_writer.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/prefs/pref_service.h" | 15 #include "base/prefs/pref_service.h" |
16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
17 #include "base/time/time.h" | 17 #include "base/time/time.h" |
18 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
19 #include "chrome/browser/profiles/profile_manager.h" | 19 #include "chrome/browser/profiles/profile_manager.h" |
20 #include "chrome/browser/signin/signin_manager_factory.h" | 20 #include "chrome/browser/signin/signin_manager_factory.h" |
21 #include "chrome/browser/sync/profile_sync_service.h" | |
22 #include "chrome/browser/sync/profile_sync_service_factory.h" | 21 #include "chrome/browser/sync/profile_sync_service_factory.h" |
23 #include "chrome/browser/sync/sync_ui_util.h" | 22 #include "chrome/browser/sync/sync_ui_util.h" |
24 #include "chrome/common/channel_info.h" | 23 #include "chrome/common/channel_info.h" |
25 #include "chrome/grit/generated_resources.h" | 24 #include "chrome/grit/generated_resources.h" |
| 25 #include "components/browser_sync/browser/profile_sync_service.h" |
26 #include "components/signin/core/browser/signin_manager.h" | 26 #include "components/signin/core/browser/signin_manager.h" |
27 #include "components/sync_driver/about_sync_util.h" | 27 #include "components/sync_driver/about_sync_util.h" |
28 #include "components/sync_driver/pref_names.h" | 28 #include "components/sync_driver/pref_names.h" |
29 #include "components/sync_driver/sync_prefs.h" | 29 #include "components/sync_driver/sync_prefs.h" |
30 #include "content/public/browser/browser_thread.h" | 30 #include "content/public/browser/browser_thread.h" |
31 #include "google/cacheinvalidation/types.pb.h" | 31 #include "google/cacheinvalidation/types.pb.h" |
32 #include "google_apis/gaia/gaia_constants.h" | 32 #include "google_apis/gaia/gaia_constants.h" |
33 #include "google_apis/gaia/google_service_auth_error.h" | 33 #include "google_apis/gaia/google_service_auth_error.h" |
34 #include "jni/ProfileSyncService_jni.h" | 34 #include "jni/ProfileSyncService_jni.h" |
35 #include "sync/internal_api/public/network_resources.h" | 35 #include "sync/internal_api/public/network_resources.h" |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
431 bool ProfileSyncServiceAndroid::Register(JNIEnv* env) { | 431 bool ProfileSyncServiceAndroid::Register(JNIEnv* env) { |
432 return RegisterNativesImpl(env); | 432 return RegisterNativesImpl(env); |
433 } | 433 } |
434 | 434 |
435 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 435 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
436 ProfileSyncServiceAndroid* profile_sync_service_android = | 436 ProfileSyncServiceAndroid* profile_sync_service_android = |
437 new ProfileSyncServiceAndroid(env, obj); | 437 new ProfileSyncServiceAndroid(env, obj); |
438 profile_sync_service_android->Init(); | 438 profile_sync_service_android->Init(); |
439 return reinterpret_cast<intptr_t>(profile_sync_service_android); | 439 return reinterpret_cast<intptr_t>(profile_sync_service_android); |
440 } | 440 } |
OLD | NEW |