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

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

Issue 580043002: [Android] Prompt with infobar on filename conflict (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed function order according to headers Created 5 years, 9 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 "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 78 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
79 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h" 79 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h"
80 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" 80 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h"
81 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h" 81 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h"
82 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" 82 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
83 #include "chrome/browser/ui/android/context_menu_helper.h" 83 #include "chrome/browser/ui/android/context_menu_helper.h"
84 #include "chrome/browser/ui/android/infobars/account_chooser_infobar.h" 84 #include "chrome/browser/ui/android/infobars/account_chooser_infobar.h"
85 #include "chrome/browser/ui/android/infobars/app_banner_infobar.h" 85 #include "chrome/browser/ui/android/infobars/app_banner_infobar.h"
86 #include "chrome/browser/ui/android/infobars/confirm_infobar.h" 86 #include "chrome/browser/ui/android/infobars/confirm_infobar.h"
87 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h" 87 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h"
88 #include "chrome/browser/ui/android/infobars/download_overwrite_infobar.h"
88 #include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h" 89 #include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h"
89 #include "chrome/browser/ui/android/infobars/infobar_android.h" 90 #include "chrome/browser/ui/android/infobars/infobar_android.h"
90 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" 91 #include "chrome/browser/ui/android/infobars/infobar_container_android.h"
91 #include "chrome/browser/ui/android/infobars/translate_infobar.h" 92 #include "chrome/browser/ui/android/infobars/translate_infobar.h"
92 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 93 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
93 #include "chrome/browser/ui/android/navigation_popup.h" 94 #include "chrome/browser/ui/android/navigation_popup.h"
94 #include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h" 95 #include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h"
95 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h" 96 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h"
96 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 97 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
97 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h" 98 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
(...skipping 12 matching lines...) Expand all
110 #endif 111 #endif
111 112
112 namespace chrome { 113 namespace chrome {
113 namespace android { 114 namespace android {
114 115
115 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 116 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
116 // Register JNI for components we depend on. 117 // Register JNI for components we depend on.
117 {"AppMenuDragHelper", RegisterAppMenuDragHelper}, 118 {"AppMenuDragHelper", RegisterAppMenuDragHelper},
118 {"Bookmarks", bookmarks::android::RegisterBookmarks}, 119 {"Bookmarks", bookmarks::android::RegisterBookmarks},
119 {"DomDistiller", dom_distiller::android::RegisterDomDistiller}, 120 {"DomDistiller", dom_distiller::android::RegisterDomDistiller},
120 {"ChromeDownloadDelegate", RegisterChromeDownloadDeleagte}, 121 {"ChromeDownloadDelegate", RegisterChromeDownloadDelegate},
121 {"GCMDriver", gcm::android::RegisterGCMDriverJni}, 122 {"GCMDriver", gcm::android::RegisterGCMDriverJni},
122 {"Invalidation", invalidation::android::RegisterInvalidationJni}, 123 {"Invalidation", invalidation::android::RegisterInvalidationJni},
123 {"NavigationInterception", 124 {"NavigationInterception",
124 navigation_interception::RegisterNavigationInterceptionJni}, 125 navigation_interception::RegisterNavigationInterceptionJni},
125 {"WebContentsDelegateAndroid", 126 {"WebContentsDelegateAndroid",
126 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni}, 127 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni},
127 // Register JNI for chrome classes. 128 // Register JNI for chrome classes.
128 {"AccessibilityUtils", AccessibilityUtil::Register}, 129 {"AccessibilityUtils", AccessibilityUtil::Register},
129 {"AccountChooserInfoBar", RegisterAccountChooserInfoBar}, 130 {"AccountChooserInfoBar", RegisterAccountChooserInfoBar},
130 {"AccountManagementScreenHelper", AccountManagementScreenHelper::Register}, 131 {"AccountManagementScreenHelper", AccountManagementScreenHelper::Register},
(...skipping 29 matching lines...) Expand all
160 {"ContentViewUtil", RegisterContentViewUtil}, 161 {"ContentViewUtil", RegisterContentViewUtil},
161 {"ContextMenuHelper", RegisterContextMenuHelper}, 162 {"ContextMenuHelper", RegisterContextMenuHelper},
162 {"CookiesFetcher", RegisterCookiesFetcher}, 163 {"CookiesFetcher", RegisterCookiesFetcher},
163 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register}, 164 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register},
164 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register}, 165 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register},
165 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register}, 166 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register},
166 {"DevToolsServer", RegisterDevToolsServer}, 167 {"DevToolsServer", RegisterDevToolsServer},
167 {"DomDistillerServiceFactory", 168 {"DomDistillerServiceFactory",
168 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register}, 169 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register},
169 {"DomDistillerTabUtils", RegisterDomDistillerTabUtils}, 170 {"DomDistillerTabUtils", RegisterDomDistillerTabUtils},
171 {"DownloadOverwriteInfoBarDelegate",
172 RegisterDownloadOverwriteInfoBarDelegate},
170 {"EnhancedBookmarksBridge", 173 {"EnhancedBookmarksBridge",
171 enhanced_bookmarks::android::RegisterEnhancedBookmarksBridge}, 174 enhanced_bookmarks::android::RegisterEnhancedBookmarksBridge},
172 {"ExternalPrerenderRequestHandler", 175 {"ExternalPrerenderRequestHandler",
173 prerender::ExternalPrerenderHandlerAndroid:: 176 prerender::ExternalPrerenderHandlerAndroid::
174 RegisterExternalPrerenderHandlerAndroid}, 177 RegisterExternalPrerenderHandlerAndroid},
175 {"FaviconHelper", FaviconHelper::RegisterFaviconHelper}, 178 {"FaviconHelper", FaviconHelper::RegisterFaviconHelper},
176 {"FeatureUtilities", RegisterFeatureUtilities}, 179 {"FeatureUtilities", RegisterFeatureUtilities},
177 {"FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter}, 180 {"FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter},
178 {"FindInPageBridge", FindInPageBridge::RegisterFindInPageBridge}, 181 {"FindInPageBridge", FindInPageBridge::RegisterFindInPageBridge},
179 {"FontSizePrefsAndroid", FontSizePrefsAndroid::Register}, 182 {"FontSizePrefsAndroid", FontSizePrefsAndroid::Register},
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 }; 247 };
245 248
246 bool RegisterJni(JNIEnv* env) { 249 bool RegisterJni(JNIEnv* env) {
247 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 250 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
248 return RegisterNativeMethods(env, kChromeRegisteredMethods, 251 return RegisterNativeMethods(env, kChromeRegisteredMethods,
249 arraysize(kChromeRegisteredMethods)); 252 arraysize(kChromeRegisteredMethods));
250 } 253 }
251 254
252 } // namespace android 255 } // namespace android
253 } // namespace chrome 256 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698