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

Side by Side Diff: chrome/browser/sync/profile_sync_service_android.cc

Issue 23238005: sync: Remove ModelTypeInvalidationMap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sort entries in gyp files Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/glue/session_model_associator.cc ('k') | sync/engine/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 17 matching lines...) Expand all
28 #include "chrome/browser/sync/sync_ui_util.h" 28 #include "chrome/browser/sync/sync_ui_util.h"
29 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
30 #include "content/public/browser/notification_service.h" 30 #include "content/public/browser/notification_service.h"
31 #include "content/public/browser/notification_source.h" 31 #include "content/public/browser/notification_source.h"
32 #include "google/cacheinvalidation/types.pb.h" 32 #include "google/cacheinvalidation/types.pb.h"
33 #include "google_apis/gaia/gaia_constants.h" 33 #include "google_apis/gaia/gaia_constants.h"
34 #include "google_apis/gaia/google_service_auth_error.h" 34 #include "google_apis/gaia/google_service_auth_error.h"
35 #include "google_apis/gaia/oauth2_token_service.h" 35 #include "google_apis/gaia/oauth2_token_service.h"
36 #include "grit/generated_resources.h" 36 #include "grit/generated_resources.h"
37 #include "jni/ProfileSyncService_jni.h" 37 #include "jni/ProfileSyncService_jni.h"
38 #include "sync/internal_api/public/base/model_type_invalidation_map.h"
39 #include "sync/internal_api/public/read_transaction.h" 38 #include "sync/internal_api/public/read_transaction.h"
40 #include "ui/base/l10n/l10n_util.h" 39 #include "ui/base/l10n/l10n_util.h"
41 40
42 using base::android::AttachCurrentThread; 41 using base::android::AttachCurrentThread;
43 using base::android::CheckException; 42 using base::android::CheckException;
44 using base::android::ConvertJavaStringToUTF8; 43 using base::android::ConvertJavaStringToUTF8;
45 using base::android::ConvertUTF8ToJavaString; 44 using base::android::ConvertUTF8ToJavaString;
46 using base::android::ScopedJavaLocalRef; 45 using base::android::ScopedJavaLocalRef;
47 using content::BrowserThread; 46 using content::BrowserThread;
48 47
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 ProfileSyncServiceAndroid* profile_sync_service_android = 504 ProfileSyncServiceAndroid* profile_sync_service_android =
506 new ProfileSyncServiceAndroid(env, obj); 505 new ProfileSyncServiceAndroid(env, obj);
507 profile_sync_service_android->Init(); 506 profile_sync_service_android->Init();
508 return reinterpret_cast<jint>(profile_sync_service_android); 507 return reinterpret_cast<jint>(profile_sync_service_android);
509 } 508 }
510 509
511 // static 510 // static
512 bool ProfileSyncServiceAndroid::Register(JNIEnv* env) { 511 bool ProfileSyncServiceAndroid::Register(JNIEnv* env) {
513 return RegisterNativesImpl(env); 512 return RegisterNativesImpl(env);
514 } 513 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/session_model_associator.cc ('k') | sync/engine/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698