| 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 <memory> | 10 #include <memory> | 
| (...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/browser/profile_sync_service.h" | 29 #include "components/browser_sync/browser/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/sync/core/network_resources.h" | 32 #include "components/sync/core/network_resources.h" | 
| 33 #include "components/sync/core/read_transaction.h" | 33 #include "components/sync/core/read_transaction.h" | 
| 34 #include "components/sync_driver/about_sync_util.h" | 34 #include "components/sync/driver/about_sync_util.h" | 
| 35 #include "components/sync_driver/pref_names.h" | 35 #include "components/sync/driver/pref_names.h" | 
| 36 #include "components/sync_driver/sync_prefs.h" | 36 #include "components/sync/driver/sync_prefs.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 "google_apis/gaia/google_service_auth_error.h" | 40 #include "google_apis/gaia/google_service_auth_error.h" | 
| 41 #include "grit/components_strings.h" | 41 #include "grit/components_strings.h" | 
| 42 #include "jni/ProfileSyncService_jni.h" | 42 #include "jni/ProfileSyncService_jni.h" | 
| 43 #include "ui/base/l10n/l10n_util.h" | 43 #include "ui/base/l10n/l10n_util.h" | 
| 44 | 44 | 
| 45 using base::android::AttachCurrentThread; | 45 using base::android::AttachCurrentThread; | 
| 46 using base::android::CheckException; | 46 using base::android::CheckException; | 
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 506 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 506 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 
| 507   ProfileSyncServiceAndroid* profile_sync_service_android = | 507   ProfileSyncServiceAndroid* profile_sync_service_android = | 
| 508       new ProfileSyncServiceAndroid(env, obj); | 508       new ProfileSyncServiceAndroid(env, obj); | 
| 509   if (profile_sync_service_android->Init()) { | 509   if (profile_sync_service_android->Init()) { | 
| 510     return reinterpret_cast<intptr_t>(profile_sync_service_android); | 510     return reinterpret_cast<intptr_t>(profile_sync_service_android); | 
| 511   } else { | 511   } else { | 
| 512     delete profile_sync_service_android; | 512     delete profile_sync_service_android; | 
| 513     return 0; | 513     return 0; | 
| 514   } | 514   } | 
| 515 } | 515 } | 
| OLD | NEW | 
|---|