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

Side by Side Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 12313075: [sync] Upstream the Android ProfileSyncService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/android/chrome_jni_registrar.h" 5 #include "chrome/browser/android/chrome_jni_registrar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" 9 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
10 #include "chrome/browser/android/content_view_util.h" 10 #include "chrome/browser/android/content_view_util.h"
11 #include "chrome/browser/android/dev_tools_server.h" 11 #include "chrome/browser/android/dev_tools_server.h"
12 #include "chrome/browser/android/intent_helper.h" 12 #include "chrome/browser/android/intent_helper.h"
13 #include "chrome/browser/android/process_utils.h" 13 #include "chrome/browser/android/process_utils.h"
14 #include "chrome/browser/android/provider/chrome_browser_provider.h" 14 #include "chrome/browser/android/provider/chrome_browser_provider.h"
15 #include "chrome/browser/history/android/sqlite_cursor.h" 15 #include "chrome/browser/history/android/sqlite_cursor.h"
16 #include "chrome/browser/lifetime/application_lifetime_android.h" 16 #include "chrome/browser/lifetime/application_lifetime_android.h"
17 #include "chrome/browser/sync/profile_sync_service_android.h"
17 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 18 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
18 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" 19 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
19 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 20 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
20 #include "chrome/browser/ui/android/navigation_popup.h" 21 #include "chrome/browser/ui/android/navigation_popup.h"
21 #include "chrome/browser/ui/android/website_settings_popup_android.h" 22 #include "chrome/browser/ui/android/website_settings_popup_android.h"
22 #include "components/navigation_interception/component_jni_registrar.h" 23 #include "components/navigation_interception/component_jni_registrar.h"
23 #include "components/web_contents_delegate_android/component_jni_registrar.h" 24 #include "components/web_contents_delegate_android/component_jni_registrar.h"
24 25
25 bool RegisterCertificateViewer(JNIEnv* env); 26 bool RegisterCertificateViewer(JNIEnv* env);
26 27
(...skipping 16 matching lines...) Expand all
43 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, 44 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler },
44 { "ChromeWebContentsDelegateAndroid", 45 { "ChromeWebContentsDelegateAndroid",
45 RegisterChromeWebContentsDelegateAndroid }, 46 RegisterChromeWebContentsDelegateAndroid },
46 { "ContentViewUtil", RegisterContentViewUtil }, 47 { "ContentViewUtil", RegisterContentViewUtil },
47 { "DevToolsServer", RegisterDevToolsServer }, 48 { "DevToolsServer", RegisterDevToolsServer },
48 { "IntentHelper", RegisterIntentHelper }, 49 { "IntentHelper", RegisterIntentHelper },
49 { "JavascriptAppModalDialog", 50 { "JavascriptAppModalDialog",
50 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, 51 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
51 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, 52 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup },
52 { "ProcessUtils", RegisterProcessUtils }, 53 { "ProcessUtils", RegisterProcessUtils },
54 { "ProfileSyncService", RegisterProfileSyncServiceAndroid },
53 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, 55 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor },
54 { "WebsiteSettingsPopupAndroid", 56 { "WebsiteSettingsPopupAndroid",
55 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, 57 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid },
56 }; 58 };
57 59
58 bool RegisterJni(JNIEnv* env) { 60 bool RegisterJni(JNIEnv* env) {
59 return RegisterNativeMethods(env, kChromeRegisteredMethods, 61 return RegisterNativeMethods(env, kChromeRegisteredMethods,
60 arraysize(kChromeRegisteredMethods)); 62 arraysize(kChromeRegisteredMethods));
61 } 63 }
62 64
63 } // namespace android 65 } // namespace android
64 } // namespace chrome 66 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698