| 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_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/i18n/time_formatting.h" | 10 #include "base/i18n/time_formatting.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "chrome/browser/sync/sync_ui_util.h" | 26 #include "chrome/browser/sync/sync_ui_util.h" |
| 27 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
| 28 #include "content/public/browser/notification_service.h" | 28 #include "content/public/browser/notification_service.h" |
| 29 #include "content/public/browser/notification_source.h" | 29 #include "content/public/browser/notification_source.h" |
| 30 #include "google/cacheinvalidation/types.pb.h" | 30 #include "google/cacheinvalidation/types.pb.h" |
| 31 #include "google_apis/gaia/gaia_constants.h" | 31 #include "google_apis/gaia/gaia_constants.h" |
| 32 #include "google_apis/gaia/google_service_auth_error.h" | 32 #include "google_apis/gaia/google_service_auth_error.h" |
| 33 #include "grit/generated_resources.h" | 33 #include "grit/generated_resources.h" |
| 34 #include "jni/ProfileSyncService_jni.h" | 34 #include "jni/ProfileSyncService_jni.h" |
| 35 #include "sync/internal_api/public/read_transaction.h" | 35 #include "sync/internal_api/public/read_transaction.h" |
| 36 #include "sync/notifier/object_id_invalidation_map.h" |
| 36 #include "ui/base/l10n/l10n_util.h" | 37 #include "ui/base/l10n/l10n_util.h" |
| 37 | 38 |
| 38 using base::android::AttachCurrentThread; | 39 using base::android::AttachCurrentThread; |
| 39 using base::android::CheckException; | 40 using base::android::CheckException; |
| 40 using base::android::ConvertJavaStringToUTF8; | 41 using base::android::ConvertJavaStringToUTF8; |
| 41 using base::android::ConvertUTF8ToJavaString; | 42 using base::android::ConvertUTF8ToJavaString; |
| 42 using base::android::ScopedJavaLocalRef; | 43 using base::android::ScopedJavaLocalRef; |
| 43 using content::BrowserThread; | 44 using content::BrowserThread; |
| 44 | 45 |
| 45 namespace { | 46 namespace { |
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 505 ProfileSyncServiceAndroid* profile_sync_service_android = | 506 ProfileSyncServiceAndroid* profile_sync_service_android = |
| 506 new ProfileSyncServiceAndroid(env, obj); | 507 new ProfileSyncServiceAndroid(env, obj); |
| 507 profile_sync_service_android->Init(); | 508 profile_sync_service_android->Init(); |
| 508 return reinterpret_cast<intptr_t>(profile_sync_service_android); | 509 return reinterpret_cast<intptr_t>(profile_sync_service_android); |
| 509 } | 510 } |
| 510 | 511 |
| 511 // static | 512 // static |
| 512 bool ProfileSyncServiceAndroid::Register(JNIEnv* env) { | 513 bool ProfileSyncServiceAndroid::Register(JNIEnv* env) { |
| 513 return RegisterNativesImpl(env); | 514 return RegisterNativesImpl(env); |
| 514 } | 515 } |
| OLD | NEW |