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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 #include "base/android/jni_array.h" 11 #include "base/android/jni_array.h"
12 #include "base/android/jni_string.h" 12 #include "base/android/jni_string.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/i18n/time_formatting.h" 14 #include "base/i18n/time_formatting.h"
15 #include "base/json/json_writer.h" 15 #include "base/json/json_writer.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/prefs/pref_service.h"
19 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
20 #include "base/time/time.h" 19 #include "base/time/time.h"
21 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/profiles/profile_manager.h" 21 #include "chrome/browser/profiles/profile_manager.h"
23 #include "chrome/browser/signin/signin_manager_factory.h" 22 #include "chrome/browser/signin/signin_manager_factory.h"
24 #include "chrome/browser/sync/profile_sync_service_factory.h" 23 #include "chrome/browser/sync/profile_sync_service_factory.h"
25 #include "chrome/browser/sync/sync_ui_util.h" 24 #include "chrome/browser/sync/sync_ui_util.h"
26 #include "chrome/common/channel_info.h" 25 #include "chrome/common/channel_info.h"
27 #include "chrome/grit/generated_resources.h" 26 #include "chrome/grit/generated_resources.h"
28 #include "components/browser_sync/browser/profile_sync_service.h" 27 #include "components/browser_sync/browser/profile_sync_service.h"
28 #include "components/prefs/pref_service.h"
29 #include "components/signin/core/browser/signin_manager.h" 29 #include "components/signin/core/browser/signin_manager.h"
30 #include "components/sync_driver/about_sync_util.h" 30 #include "components/sync_driver/about_sync_util.h"
31 #include "components/sync_driver/pref_names.h" 31 #include "components/sync_driver/pref_names.h"
32 #include "components/sync_driver/sync_prefs.h" 32 #include "components/sync_driver/sync_prefs.h"
33 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
34 #include "google/cacheinvalidation/types.pb.h" 34 #include "google/cacheinvalidation/types.pb.h"
35 #include "google_apis/gaia/gaia_constants.h" 35 #include "google_apis/gaia/gaia_constants.h"
36 #include "google_apis/gaia/google_service_auth_error.h" 36 #include "google_apis/gaia/google_service_auth_error.h"
37 #include "grit/components_strings.h" 37 #include "grit/components_strings.h"
38 #include "jni/ProfileSyncService_jni.h" 38 #include "jni/ProfileSyncService_jni.h"
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { 499 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
500 ProfileSyncServiceAndroid* profile_sync_service_android = 500 ProfileSyncServiceAndroid* profile_sync_service_android =
501 new ProfileSyncServiceAndroid(env, obj); 501 new ProfileSyncServiceAndroid(env, obj);
502 if (profile_sync_service_android->Init()) { 502 if (profile_sync_service_android->Init()) {
503 return reinterpret_cast<intptr_t>(profile_sync_service_android); 503 return reinterpret_cast<intptr_t>(profile_sync_service_android);
504 } else { 504 } else {
505 delete profile_sync_service_android; 505 delete profile_sync_service_android;
506 return 0; 506 return 0;
507 } 507 }
508 } 508 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698