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

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

Issue 12045081: Android implementation of WebsiteSettingsUi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix memory leak 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 | Annotate | Revision Log
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/lifetime/application_lifetime_android.h" 16 #include "chrome/browser/lifetime/application_lifetime_android.h"
17 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 17 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
18 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" 18 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
19 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 19 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
20 #include "chrome/browser/ui/android/navigation_popup.h" 20 #include "chrome/browser/ui/android/navigation_popup.h"
21 #include "chrome/browser/ui/android/website_settings_popup_android.h"
21 #include "components/navigation_interception/component_jni_registrar.h" 22 #include "components/navigation_interception/component_jni_registrar.h"
22 #include "components/web_contents_delegate_android/component_jni_registrar.h" 23 #include "components/web_contents_delegate_android/component_jni_registrar.h"
23 24
24 namespace chrome { 25 namespace chrome {
25 namespace android { 26 namespace android {
26 27
27 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 28 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
28 // Register JNI for components we depend on. 29 // Register JNI for components we depend on.
29 { "NavigationInterception", components::RegisterNavigationInterceptionJni }, 30 { "NavigationInterception", components::RegisterNavigationInterceptionJni },
30 { "WebContentsDelegateAndroid", 31 { "WebContentsDelegateAndroid",
31 components::RegisterWebContentsDelegateAndroidJni }, 32 components::RegisterWebContentsDelegateAndroidJni },
32 // Register JNI for chrome classes. 33 // Register JNI for chrome classes.
33 { "ApplicationLifetime", browser::RegisterApplicationLifetimeAndroid}, 34 { "ApplicationLifetime", browser::RegisterApplicationLifetimeAndroid},
34 { "AutofillPopup", 35 { "AutofillPopup",
35 AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, 36 AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid},
36 { "ChromeBrowserProvider", 37 { "ChromeBrowserProvider",
37 ChromeBrowserProvider::RegisterChromeBrowserProvider }, 38 ChromeBrowserProvider::RegisterChromeBrowserProvider },
38 { "ChromeHttpAuthHandler", 39 { "ChromeHttpAuthHandler",
39 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, 40 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler },
40 { "ChromeWebContentsDelegateAndroid", 41 { "ChromeWebContentsDelegateAndroid",
41 RegisterChromeWebContentsDelegateAndroid }, 42 RegisterChromeWebContentsDelegateAndroid },
42 { "ContentViewUtil", RegisterContentViewUtil }, 43 { "ContentViewUtil", RegisterContentViewUtil },
43 { "DevToolsServer", RegisterDevToolsServer }, 44 { "DevToolsServer", RegisterDevToolsServer },
44 { "IntentHelper", RegisterIntentHelper }, 45 { "IntentHelper", RegisterIntentHelper },
45 { "JavascriptAppModalDialog", 46 { "JavascriptAppModalDialog",
46 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, 47 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
47 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, 48 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup },
48 { "ProcessUtils", RegisterProcessUtils }, 49 { "ProcessUtils", RegisterProcessUtils },
49 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, 50 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor },
51 { "WebsiteSettingsPopupAndroid",
52 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid },
Ted C 2013/01/25 02:04:05 indenting is off here it looks like
Yaron 2013/01/25 19:25:17 Done.
50 }; 53 };
51 54
52 bool RegisterJni(JNIEnv* env) { 55 bool RegisterJni(JNIEnv* env) {
53 return RegisterNativeMethods(env, kChromeRegisteredMethods, 56 return RegisterNativeMethods(env, kChromeRegisteredMethods,
54 arraysize(kChromeRegisteredMethods)); 57 arraysize(kChromeRegisteredMethods));
55 } 58 }
56 59
57 } // namespace android 60 } // namespace android
58 } // namespace chrome 61 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698