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 "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/ui/android/autofill/autofill_popup_view_android.h" | 16 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" |
17 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" | 17 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" |
18 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" | 18 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" |
| 19 #include "chrome/browser/ui/android/navigation_popup.h" |
19 #include "content/components/navigation_interception/component_jni_registrar.h" | 20 #include "content/components/navigation_interception/component_jni_registrar.h" |
20 #include "content/components/web_contents_delegate_android/color_chooser_android
.h" | 21 #include "content/components/web_contents_delegate_android/color_chooser_android
.h" |
21 #include "content/components/web_contents_delegate_android/component_jni_registr
ar.h" | 22 #include "content/components/web_contents_delegate_android/component_jni_registr
ar.h" |
22 | 23 |
23 namespace chrome { | 24 namespace chrome { |
24 namespace android { | 25 namespace android { |
25 | 26 |
26 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { | 27 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
27 { "AutofillPopup", | 28 { "AutofillPopup", |
28 AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, | 29 AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, |
29 { "ChromeBrowserProvider", | 30 { "ChromeBrowserProvider", |
30 ChromeBrowserProvider::RegisterChromeBrowserProvider }, | 31 ChromeBrowserProvider::RegisterChromeBrowserProvider }, |
31 { "ChromeHttpAuthHandler", | 32 { "ChromeHttpAuthHandler", |
32 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, | 33 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, |
33 { "ChromeWebContentsDelegateAndroid", | 34 { "ChromeWebContentsDelegateAndroid", |
34 RegisterChromeWebContentsDelegateAndroid }, | 35 RegisterChromeWebContentsDelegateAndroid }, |
35 { "ColorChooserAndroid", content::RegisterColorChooserAndroid }, | 36 { "ColorChooserAndroid", content::RegisterColorChooserAndroid }, |
36 { "ContentViewUtil", RegisterContentViewUtil }, | 37 { "ContentViewUtil", RegisterContentViewUtil }, |
37 { "DevToolsServer", RegisterDevToolsServer }, | 38 { "DevToolsServer", RegisterDevToolsServer }, |
38 { "IntentHelper", RegisterIntentHelper }, | 39 { "IntentHelper", RegisterIntentHelper }, |
39 { "JavascriptAppModalDialog", | 40 { "JavascriptAppModalDialog", |
40 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, | 41 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, |
| 42 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, |
41 { "ProcessUtils", RegisterProcessUtils }, | 43 { "ProcessUtils", RegisterProcessUtils }, |
42 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, | 44 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, |
43 { "navigation_interception", content::RegisterNavigationInterceptionJni }, | 45 { "navigation_interception", content::RegisterNavigationInterceptionJni }, |
44 }; | 46 }; |
45 | 47 |
46 bool RegisterJni(JNIEnv* env) { | 48 bool RegisterJni(JNIEnv* env) { |
47 content::RegisterWebContentsDelegateAndroidJni(env); | 49 content::RegisterWebContentsDelegateAndroidJni(env); |
48 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 50 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
49 arraysize(kChromeRegisteredMethods)); | 51 arraysize(kChromeRegisteredMethods)); |
50 } | 52 } |
51 | 53 |
52 } // namespace android | 54 } // namespace android |
53 } // namespace chrome | 55 } // namespace chrome |
OLD | NEW |