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

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: fixed nits Created 5 years, 10 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h" 76 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h"
77 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 77 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
78 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h" 78 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h"
79 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" 79 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h"
80 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h" 80 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h"
81 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" 81 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
82 #include "chrome/browser/ui/android/context_menu_helper.h" 82 #include "chrome/browser/ui/android/context_menu_helper.h"
83 #include "chrome/browser/ui/android/infobars/app_banner_infobar.h" 83 #include "chrome/browser/ui/android/infobars/app_banner_infobar.h"
84 #include "chrome/browser/ui/android/infobars/confirm_infobar.h" 84 #include "chrome/browser/ui/android/infobars/confirm_infobar.h"
85 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h" 85 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h"
86 #include "chrome/browser/ui/android/infobars/download_overwrite_infobar.h"
86 #include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h" 87 #include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h"
87 #include "chrome/browser/ui/android/infobars/infobar_android.h" 88 #include "chrome/browser/ui/android/infobars/infobar_android.h"
88 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" 89 #include "chrome/browser/ui/android/infobars/infobar_container_android.h"
89 #include "chrome/browser/ui/android/infobars/translate_infobar.h" 90 #include "chrome/browser/ui/android/infobars/translate_infobar.h"
90 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 91 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
91 #include "chrome/browser/ui/android/navigation_popup.h" 92 #include "chrome/browser/ui/android/navigation_popup.h"
92 #include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h" 93 #include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h"
93 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h" 94 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h"
94 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 95 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
95 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h" 96 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 {"ContentViewUtil", RegisterContentViewUtil}, 158 {"ContentViewUtil", RegisterContentViewUtil},
158 {"ContextMenuHelper", RegisterContextMenuHelper}, 159 {"ContextMenuHelper", RegisterContextMenuHelper},
159 {"CookiesFetcher", RegisterCookiesFetcher}, 160 {"CookiesFetcher", RegisterCookiesFetcher},
160 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register}, 161 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register},
161 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register}, 162 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register},
162 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register}, 163 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register},
163 {"DevToolsServer", RegisterDevToolsServer}, 164 {"DevToolsServer", RegisterDevToolsServer},
164 {"DomDistillerServiceFactory", 165 {"DomDistillerServiceFactory",
165 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register}, 166 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register},
166 {"DomDistillerTabUtils", RegisterDomDistillerTabUtils}, 167 {"DomDistillerTabUtils", RegisterDomDistillerTabUtils},
168 {"DownloadOverwriteInfoBarDelegate",
169 RegisterDownloadOverwriteInfoBarDelegate},
167 {"EnhancedBookmarksBridge", 170 {"EnhancedBookmarksBridge",
168 enhanced_bookmarks::android::RegisterEnhancedBookmarksBridge}, 171 enhanced_bookmarks::android::RegisterEnhancedBookmarksBridge},
169 {"ExternalPrerenderRequestHandler", 172 {"ExternalPrerenderRequestHandler",
170 prerender::ExternalPrerenderHandlerAndroid:: 173 prerender::ExternalPrerenderHandlerAndroid::
171 RegisterExternalPrerenderHandlerAndroid}, 174 RegisterExternalPrerenderHandlerAndroid},
172 {"FaviconHelper", FaviconHelper::RegisterFaviconHelper}, 175 {"FaviconHelper", FaviconHelper::RegisterFaviconHelper},
173 {"FeatureUtilities", RegisterFeatureUtilities}, 176 {"FeatureUtilities", RegisterFeatureUtilities},
174 {"FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter}, 177 {"FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter},
175 {"FindInPageBridge", FindInPageBridge::RegisterFindInPageBridge}, 178 {"FindInPageBridge", FindInPageBridge::RegisterFindInPageBridge},
176 {"FontSizePrefsAndroid", FontSizePrefsAndroid::Register}, 179 {"FontSizePrefsAndroid", FontSizePrefsAndroid::Register},
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 }; 243 };
241 244
242 bool RegisterJni(JNIEnv* env) { 245 bool RegisterJni(JNIEnv* env) {
243 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 246 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
244 return RegisterNativeMethods(env, kChromeRegisteredMethods, 247 return RegisterNativeMethods(env, kChromeRegisteredMethods,
245 arraysize(kChromeRegisteredMethods)); 248 arraysize(kChromeRegisteredMethods));
246 } 249 }
247 250
248 } // namespace android 251 } // namespace android
249 } // namespace chrome 252 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698