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

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

Issue 45693002: Add ExternalPrerenderRequestHandler and related API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nit fixes and fixing the test Created 7 years, 1 month 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 "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"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/android/shortcut_helper.h" 23 #include "chrome/browser/android/shortcut_helper.h"
24 #include "chrome/browser/android/signin/signin_manager_android.h" 24 #include "chrome/browser/android/signin/signin_manager_android.h"
25 #include "chrome/browser/android/tab_android.h" 25 #include "chrome/browser/android/tab_android.h"
26 #include "chrome/browser/android/uma_utils.h" 26 #include "chrome/browser/android/uma_utils.h"
27 #include "chrome/browser/android/url_utilities.h" 27 #include "chrome/browser/android/url_utilities.h"
28 #include "chrome/browser/autofill/android/personal_data_manager_android.h" 28 #include "chrome/browser/autofill/android/personal_data_manager_android.h"
29 #include "chrome/browser/history/android/sqlite_cursor.h" 29 #include "chrome/browser/history/android/sqlite_cursor.h"
30 #include "chrome/browser/invalidation/invalidation_controller_android.h" 30 #include "chrome/browser/invalidation/invalidation_controller_android.h"
31 #include "chrome/browser/lifetime/application_lifetime_android.h" 31 #include "chrome/browser/lifetime/application_lifetime_android.h"
32 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 32 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
33 #include "chrome/browser/prerender/external_prerender_handler_android.h"
33 #include "chrome/browser/profiles/profile_android.h" 34 #include "chrome/browser/profiles/profile_android.h"
34 #include "chrome/browser/search_engines/template_url_service_android.h" 35 #include "chrome/browser/search_engines/template_url_service_android.h"
35 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" 36 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
36 #include "chrome/browser/speech/tts_android.h" 37 #include "chrome/browser/speech/tts_android.h"
37 #include "chrome/browser/sync/profile_sync_service_android.h" 38 #include "chrome/browser/sync/profile_sync_service_android.h"
38 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" 39 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h"
39 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" 40 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h"
40 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 41 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
41 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" 42 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
42 #include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android .h" 43 #include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android .h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 prerender::ExternalPrerenderHandlerAndroid::
98 RegisterExternalPrerenderHandlerAndroid },
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
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698