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

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: addressed ted's comments Created 6 years, 2 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/debug/trace_event.h" 9 #include "base/debug/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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "chrome/browser/sync/profile_sync_service_android.h" 54 #include "chrome/browser/sync/profile_sync_service_android.h"
55 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" 55 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h"
56 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" 56 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h"
57 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h" 57 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h"
58 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 58 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
59 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" 59 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
60 #include "chrome/browser/ui/android/context_menu_helper.h" 60 #include "chrome/browser/ui/android/context_menu_helper.h"
61 #include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android .h" 61 #include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android .h"
62 #include "chrome/browser/ui/android/infobars/confirm_infobar.h" 62 #include "chrome/browser/ui/android/infobars/confirm_infobar.h"
63 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h" 63 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h"
64 #include "chrome/browser/ui/android/infobars/download_overwrite_infobar.h"
64 #include "chrome/browser/ui/android/infobars/infobar_android.h" 65 #include "chrome/browser/ui/android/infobars/infobar_android.h"
65 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" 66 #include "chrome/browser/ui/android/infobars/infobar_container_android.h"
66 #include "chrome/browser/ui/android/infobars/translate_infobar.h" 67 #include "chrome/browser/ui/android/infobars/translate_infobar.h"
67 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 68 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
68 #include "chrome/browser/ui/android/navigation_popup.h" 69 #include "chrome/browser/ui/android/navigation_popup.h"
69 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h" 70 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h"
70 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 71 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
71 #include "chrome/browser/ui/android/tab_model/tab_model_base.h" 72 #include "chrome/browser/ui/android/tab_model/tab_model_base.h"
72 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h" 73 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
73 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" 74 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 ChromiumApplication::RegisterBindings }, 132 ChromiumApplication::RegisterBindings },
132 { "ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate }, 133 { "ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate },
133 { "ContentViewUtil", RegisterContentViewUtil }, 134 { "ContentViewUtil", RegisterContentViewUtil },
134 { "ContextMenuHelper", RegisterContextMenuHelper }, 135 { "ContextMenuHelper", RegisterContextMenuHelper },
135 { "DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register }, 136 { "DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register },
136 { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register }, 137 { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register },
137 { "DevToolsServer", RegisterDevToolsServer }, 138 { "DevToolsServer", RegisterDevToolsServer },
138 { "DomDistillerServiceFactory", 139 { "DomDistillerServiceFactory",
139 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register }, 140 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register },
140 { "DomDistillerTabUtils", RegisterDomDistillerTabUtils }, 141 { "DomDistillerTabUtils", RegisterDomDistillerTabUtils },
142 { "DownloadOverwriteInfoBarDelegate",
143 RegisterDownloadOverwriteInfoBarDelegate },
141 { "EnhancedBookmarksBridge", 144 { "EnhancedBookmarksBridge",
142 enhanced_bookmarks::android::RegisterEnhancedBookmarksBridge}, 145 enhanced_bookmarks::android::RegisterEnhancedBookmarksBridge},
143 { "ExternalPrerenderRequestHandler", 146 { "ExternalPrerenderRequestHandler",
144 prerender::ExternalPrerenderHandlerAndroid:: 147 prerender::ExternalPrerenderHandlerAndroid::
145 RegisterExternalPrerenderHandlerAndroid }, 148 RegisterExternalPrerenderHandlerAndroid },
146 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper }, 149 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper },
147 { "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter }, 150 { "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter },
148 { "FindInPageBridge", FindInPageBridge::RegisterFindInPageBridge }, 151 { "FindInPageBridge", FindInPageBridge::RegisterFindInPageBridge },
149 { "FontSizePrefsAndroid", FontSizePrefsAndroid::Register }, 152 { "FontSizePrefsAndroid", FontSizePrefsAndroid::Register },
150 { "ForeignSessionHelper", 153 { "ForeignSessionHelper",
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 }; 202 };
200 203
201 bool RegisterJni(JNIEnv* env) { 204 bool RegisterJni(JNIEnv* env) {
202 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 205 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
203 return RegisterNativeMethods(env, kChromeRegisteredMethods, 206 return RegisterNativeMethods(env, kChromeRegisteredMethods,
204 arraysize(kChromeRegisteredMethods)); 207 arraysize(kChromeRegisteredMethods));
205 } 208 }
206 209
207 } // namespace android 210 } // namespace android
208 } // namespace chrome 211 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698