| OLD | NEW |
| 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/bookmarks_bridge.h" | 10 #include "chrome/browser/android/bookmarks_bridge.h" |
| 11 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" | 11 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" |
| 12 #include "chrome/browser/android/chromium_application.h" | 12 #include "chrome/browser/android/chromium_application.h" |
| 13 #include "chrome/browser/android/content_view_util.h" | 13 #include "chrome/browser/android/content_view_util.h" |
| 14 #include "chrome/browser/android/dev_tools_server.h" | 14 #include "chrome/browser/android/dev_tools_server.h" |
| 15 #include "chrome/browser/android/external_prerender_request_handler.h" |
| 15 #include "chrome/browser/android/favicon_helper.h" | 16 #include "chrome/browser/android/favicon_helper.h" |
| 16 #include "chrome/browser/android/field_trial_helper.h" | 17 #include "chrome/browser/android/field_trial_helper.h" |
| 17 #include "chrome/browser/android/foreign_session_helper.h" | 18 #include "chrome/browser/android/foreign_session_helper.h" |
| 18 #include "chrome/browser/android/intent_helper.h" | 19 #include "chrome/browser/android/intent_helper.h" |
| 19 #include "chrome/browser/android/most_visited_sites.h" | 20 #include "chrome/browser/android/most_visited_sites.h" |
| 20 #include "chrome/browser/android/omnibox/omnibox_prerender.h" | 21 #include "chrome/browser/android/omnibox/omnibox_prerender.h" |
| 21 #include "chrome/browser/android/provider/chrome_browser_provider.h" | 22 #include "chrome/browser/android/provider/chrome_browser_provider.h" |
| 22 #include "chrome/browser/android/recently_closed_tabs_bridge.h" | 23 #include "chrome/browser/android/recently_closed_tabs_bridge.h" |
| 23 #include "chrome/browser/android/shortcut_helper.h" | 24 #include "chrome/browser/android/shortcut_helper.h" |
| 24 #include "chrome/browser/android/signin/signin_manager_android.h" | 25 #include "chrome/browser/android/signin/signin_manager_android.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, | 86 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, |
| 86 { "ChromeWebContentsDelegateAndroid", | 87 { "ChromeWebContentsDelegateAndroid", |
| 87 RegisterChromeWebContentsDelegateAndroid }, | 88 RegisterChromeWebContentsDelegateAndroid }, |
| 88 { "ChromiumApplication", | 89 { "ChromiumApplication", |
| 89 ChromiumApplication::RegisterBindings }, | 90 ChromiumApplication::RegisterBindings }, |
| 90 { "ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate }, | 91 { "ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate }, |
| 91 { "ContentViewUtil", RegisterContentViewUtil }, | 92 { "ContentViewUtil", RegisterContentViewUtil }, |
| 92 { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register }, | 93 { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register }, |
| 93 { "DevToolsServer", RegisterDevToolsServer }, | 94 { "DevToolsServer", RegisterDevToolsServer }, |
| 94 { "InvalidationController", invalidation::RegisterInvalidationController }, | 95 { "InvalidationController", invalidation::RegisterInvalidationController }, |
| 96 { "ExternalPrerenderRequestHandler", |
| 97 ExternalPrerenderRequestHandler:: |
| 98 RegisterExternalPrerenderRequestHandler }, |
| 95 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper }, | 99 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper }, |
| 96 { "FieldTrialHelper", RegisterFieldTrialHelper }, | 100 { "FieldTrialHelper", RegisterFieldTrialHelper }, |
| 97 { "ForeignSessionHelper", | 101 { "ForeignSessionHelper", |
| 98 ForeignSessionHelper::RegisterForeignSessionHelper }, | 102 ForeignSessionHelper::RegisterForeignSessionHelper }, |
| 99 { "InfoBarContainer", RegisterInfoBarContainer }, | 103 { "InfoBarContainer", RegisterInfoBarContainer }, |
| 100 { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper }, | 104 { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper }, |
| 101 { "IntentHelper", RegisterIntentHelper }, | 105 { "IntentHelper", RegisterIntentHelper }, |
| 102 { "JavascriptAppModalDialog", | 106 { "JavascriptAppModalDialog", |
| 103 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, | 107 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, |
| 104 { "MostVisitedSites", RegisterMostVisitedSites }, | 108 { "MostVisitedSites", RegisterMostVisitedSites }, |
| (...skipping 21 matching lines...) Expand all Loading... |
| 126 }; | 130 }; |
| 127 | 131 |
| 128 bool RegisterJni(JNIEnv* env) { | 132 bool RegisterJni(JNIEnv* env) { |
| 129 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 133 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 130 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 134 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 131 arraysize(kChromeRegisteredMethods)); | 135 arraysize(kChromeRegisteredMethods)); |
| 132 } | 136 } |
| 133 | 137 |
| 134 } // namespace android | 138 } // namespace android |
| 135 } // namespace chrome | 139 } // namespace chrome |
| OLD | NEW |