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

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

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

Powered by Google App Engine
This is Rietveld 408576698