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

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

Issue 1552333002: Resubmit Supervised user web restrictions content provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Manual rebase to fix merge problem Created 4 years, 11 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 (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/macros.h" 9 #include "base/macros.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 #include "chrome/browser/prerender/external_prerender_handler_android.h" 107 #include "chrome/browser/prerender/external_prerender_handler_android.h"
108 #include "chrome/browser/profiles/profile_android.h" 108 #include "chrome/browser/profiles/profile_android.h"
109 #include "chrome/browser/push_messaging/push_messaging_service_observer_android. h" 109 #include "chrome/browser/push_messaging/push_messaging_service_observer_android. h"
110 #include "chrome/browser/search_engines/template_url_service_android.h" 110 #include "chrome/browser/search_engines/template_url_service_android.h"
111 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" 111 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h"
112 #include "chrome/browser/speech/tts_android.h" 112 #include "chrome/browser/speech/tts_android.h"
113 #include "chrome/browser/spellchecker/spellchecker_session_bridge_android.h" 113 #include "chrome/browser/spellchecker/spellchecker_session_bridge_android.h"
114 #include "chrome/browser/ssl/security_state_model_android.h" 114 #include "chrome/browser/ssl/security_state_model_android.h"
115 #include "chrome/browser/supervised_user/child_accounts/child_account_feedback_r eporter_android.h" 115 #include "chrome/browser/supervised_user/child_accounts/child_account_feedback_r eporter_android.h"
116 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an droid.h" 116 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an droid.h"
117 #include "chrome/browser/supervised_user/supervised_user_content_provider_androi d.h"
117 #include "chrome/browser/sync/profile_sync_service_android.h" 118 #include "chrome/browser/sync/profile_sync_service_android.h"
118 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" 119 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h"
119 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" 120 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h"
120 #include "chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h" 121 #include "chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h"
121 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h" 122 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h"
122 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 123 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
123 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h" 124 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h"
124 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" 125 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h"
125 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h" 126 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h"
126 #include "chrome/browser/ui/android/bluetooth_chooser_android.h" 127 #include "chrome/browser/ui/android/bluetooth_chooser_android.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 {"ScreenshotTask", RegisterScreenshotTask}, 331 {"ScreenshotTask", RegisterScreenshotTask},
331 {"ServiceTabLauncher", service_tab_launcher::RegisterServiceTabLauncherJni}, 332 {"ServiceTabLauncher", service_tab_launcher::RegisterServiceTabLauncherJni},
332 {"SessionTabHelper", RegisterSessionTabHelper}, 333 {"SessionTabHelper", RegisterSessionTabHelper},
333 {"SigninManager", SigninManagerAndroid::Register}, 334 {"SigninManager", SigninManagerAndroid::Register},
334 {"SingleTabModel", RegisterSingleTabModel}, 335 {"SingleTabModel", RegisterSingleTabModel},
335 {"SpellCheckerSessionBridge", SpellCheckerSessionBridge::RegisterJNI}, 336 {"SpellCheckerSessionBridge", SpellCheckerSessionBridge::RegisterJNI},
336 {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, 337 {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor},
337 {"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid}, 338 {"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid},
338 {"StartupMetricUtils", RegisterStartupMetricUtils}, 339 {"StartupMetricUtils", RegisterStartupMetricUtils},
339 {"StaticTabSceneLayer", chrome::android::RegisterStaticTabSceneLayer}, 340 {"StaticTabSceneLayer", chrome::android::RegisterStaticTabSceneLayer},
341 {"SupervisedUserContentProvider", SupervisedUserContentProvider::Register},
340 {"Sync", syncer::RegisterSyncJni}, 342 {"Sync", syncer::RegisterSyncJni},
341 {"TabAndroid", TabAndroid::RegisterTabAndroid}, 343 {"TabAndroid", TabAndroid::RegisterTabAndroid},
342 {"TabContentManager", chrome::android::RegisterTabContentManager}, 344 {"TabContentManager", chrome::android::RegisterTabContentManager},
343 {"TabListSceneLayer", RegisterTabListSceneLayer}, 345 {"TabListSceneLayer", RegisterTabListSceneLayer},
344 {"TabModelJniBridge", TabModelJniBridge::Register}, 346 {"TabModelJniBridge", TabModelJniBridge::Register},
345 {"TabState", RegisterTabState}, 347 {"TabState", RegisterTabState},
346 {"TabStripSceneLayer", RegisterTabStripSceneLayer}, 348 {"TabStripSceneLayer", RegisterTabStripSceneLayer},
347 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid}, 349 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid},
348 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, 350 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register},
349 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, 351 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid},
(...skipping 17 matching lines...) Expand all
367 }; 369 };
368 370
369 bool RegisterBrowserJNI(JNIEnv* env) { 371 bool RegisterBrowserJNI(JNIEnv* env) {
370 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 372 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
371 return RegisterNativeMethods(env, kChromeRegisteredMethods, 373 return RegisterNativeMethods(env, kChromeRegisteredMethods,
372 arraysize(kChromeRegisteredMethods)); 374 arraysize(kChromeRegisteredMethods));
373 } 375 }
374 376
375 } // namespace android 377 } // namespace android
376 } // namespace chrome 378 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698