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

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

Issue 11830043: Move content/components/navigation_interception to src/components (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix win build Created 7 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 "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 "chrome/browser/ui/android/navigation_popup.h"
20 #include "components/navigation_interception/component_jni_registrar.h"
20 #include "components/web_contents_delegate_android/component_jni_registrar.h" 21 #include "components/web_contents_delegate_android/component_jni_registrar.h"
21 #include "content/components/navigation_interception/component_jni_registrar.h"
22 22
23 namespace chrome { 23 namespace chrome {
24 namespace android { 24 namespace android {
25 25
26 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 26 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
27 // Register JNI for components we depend on. 27 // Register JNI for components we depend on.
28 { "NavigationInterception", content::RegisterNavigationInterceptionJni }, 28 { "NavigationInterception", components::RegisterNavigationInterceptionJni },
29 { "WebContentsDelegateAndroid", 29 { "WebContentsDelegateAndroid",
30 components::RegisterWebContentsDelegateAndroidJni }, 30 components::RegisterWebContentsDelegateAndroidJni },
31 // Register JNI for chrome classes. 31 // Register JNI for chrome classes.
32 { "AutofillPopup", 32 { "AutofillPopup",
33 AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, 33 AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid},
34 { "ChromeBrowserProvider", 34 { "ChromeBrowserProvider",
35 ChromeBrowserProvider::RegisterChromeBrowserProvider }, 35 ChromeBrowserProvider::RegisterChromeBrowserProvider },
36 { "ChromeHttpAuthHandler", 36 { "ChromeHttpAuthHandler",
37 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, 37 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler },
38 { "ChromeWebContentsDelegateAndroid", 38 { "ChromeWebContentsDelegateAndroid",
39 RegisterChromeWebContentsDelegateAndroid }, 39 RegisterChromeWebContentsDelegateAndroid },
40 { "ContentViewUtil", RegisterContentViewUtil }, 40 { "ContentViewUtil", RegisterContentViewUtil },
41 { "DevToolsServer", RegisterDevToolsServer }, 41 { "DevToolsServer", RegisterDevToolsServer },
42 { "IntentHelper", RegisterIntentHelper }, 42 { "IntentHelper", RegisterIntentHelper },
43 { "JavascriptAppModalDialog", 43 { "JavascriptAppModalDialog",
44 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, 44 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
45 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, 45 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup },
46 { "ProcessUtils", RegisterProcessUtils }, 46 { "ProcessUtils", RegisterProcessUtils },
47 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, 47 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor },
48 }; 48 };
49 49
50 bool RegisterJni(JNIEnv* env) { 50 bool RegisterJni(JNIEnv* env) {
51 return RegisterNativeMethods(env, kChromeRegisteredMethods, 51 return RegisterNativeMethods(env, kChromeRegisteredMethods,
52 arraysize(kChromeRegisteredMethods)); 52 arraysize(kChromeRegisteredMethods));
53 } 53 }
54 54
55 } // namespace android 55 } // namespace android
56 } // namespace chrome 56 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698