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

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

Powered by Google App Engine
This is Rietveld 408576698