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

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

Issue 789853002: Add support for child accounts on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: x Created 6 years 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 (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 "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "chrome/browser/history/android/sqlite_cursor.h" 49 #include "chrome/browser/history/android/sqlite_cursor.h"
50 #include "chrome/browser/invalidation/invalidation_service_factory_android.h" 50 #include "chrome/browser/invalidation/invalidation_service_factory_android.h"
51 #include "chrome/browser/lifetime/application_lifetime_android.h" 51 #include "chrome/browser/lifetime/application_lifetime_android.h"
52 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 52 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
53 #include "chrome/browser/notifications/notification_ui_manager_android.h" 53 #include "chrome/browser/notifications/notification_ui_manager_android.h"
54 #include "chrome/browser/prerender/external_prerender_handler_android.h" 54 #include "chrome/browser/prerender/external_prerender_handler_android.h"
55 #include "chrome/browser/profiles/profile_android.h" 55 #include "chrome/browser/profiles/profile_android.h"
56 #include "chrome/browser/search_engines/template_url_service_android.h" 56 #include "chrome/browser/search_engines/template_url_service_android.h"
57 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" 57 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
58 #include "chrome/browser/speech/tts_android.h" 58 #include "chrome/browser/speech/tts_android.h"
59 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an droid.h"
59 #include "chrome/browser/sync/profile_sync_service_android.h" 60 #include "chrome/browser/sync/profile_sync_service_android.h"
60 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" 61 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h"
61 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" 62 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h"
62 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h" 63 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h"
63 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 64 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
64 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" 65 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h"
65 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h" 66 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h"
66 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" 67 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
67 #include "chrome/browser/ui/android/context_menu_helper.h" 68 #include "chrome/browser/ui/android/context_menu_helper.h"
68 #include "chrome/browser/ui/android/infobars/confirm_infobar.h" 69 #include "chrome/browser/ui/android/infobars/confirm_infobar.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 {"AutofillDialogControllerAndroid", 120 {"AutofillDialogControllerAndroid",
120 autofill::AutofillDialogControllerAndroid:: 121 autofill::AutofillDialogControllerAndroid::
121 RegisterAutofillDialogControllerAndroid}, 122 RegisterAutofillDialogControllerAndroid},
122 {"AutofillDialogResult", 123 {"AutofillDialogResult",
123 autofill::AutofillDialogResult::RegisterAutofillDialogResult}, 124 autofill::AutofillDialogResult::RegisterAutofillDialogResult},
124 {"AutofillLoggerAndroid", autofill::AutofillLoggerAndroid::Register}, 125 {"AutofillLoggerAndroid", autofill::AutofillLoggerAndroid::Register},
125 {"AutofillPopup", 126 {"AutofillPopup",
126 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, 127 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid},
127 {"BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge}, 128 {"BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge},
128 {"CertificateViewer", RegisterCertificateViewer}, 129 {"CertificateViewer", RegisterCertificateViewer},
130 {"ChildAccountService", RegisterChildAccountService},
129 {"ChromeBrowserProvider", 131 {"ChromeBrowserProvider",
130 ChromeBrowserProvider::RegisterChromeBrowserProvider}, 132 ChromeBrowserProvider::RegisterChromeBrowserProvider},
131 {"ChromeHttpAuthHandler", 133 {"ChromeHttpAuthHandler",
132 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, 134 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler},
133 {"ChromeWebContentsDelegateAndroid", 135 {"ChromeWebContentsDelegateAndroid",
134 RegisterChromeWebContentsDelegateAndroid}, 136 RegisterChromeWebContentsDelegateAndroid},
135 {"ChromiumApplication", ChromiumApplication::RegisterBindings}, 137 {"ChromiumApplication", ChromiumApplication::RegisterBindings},
136 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate}, 138 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate},
137 {"ContentViewUtil", RegisterContentViewUtil}, 139 {"ContentViewUtil", RegisterContentViewUtil},
138 {"ContextMenuHelper", RegisterContextMenuHelper}, 140 {"ContextMenuHelper", RegisterContextMenuHelper},
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 }; 216 };
215 217
216 bool RegisterJni(JNIEnv* env) { 218 bool RegisterJni(JNIEnv* env) {
217 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 219 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
218 return RegisterNativeMethods(env, kChromeRegisteredMethods, 220 return RegisterNativeMethods(env, kChromeRegisteredMethods,
219 arraysize(kChromeRegisteredMethods)); 221 arraysize(kChromeRegisteredMethods));
220 } 222 }
221 223
222 } // namespace android 224 } // namespace android
223 } // namespace chrome 225 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698