chrome/browser/android/chrome_jni_registrar.cc - Issue 580043002: [Android] Prompt with infobar on filename conflict

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 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:

Index: chrome/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index 0ff52278beca43b5059c8e6f910298101bf647ba..2570fff204817993982df79556b910b87a0344a2 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -85,6 +85,7 @@

#include "chrome/browser/ui/android/infobars/app_banner_infobar.h"

#include "chrome/browser/ui/android/infobars/confirm_infobar.h"

#include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h"

+#include "chrome/browser/ui/android/infobars/download_overwrite_infobar.h"

#include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h"

#include "chrome/browser/ui/android/infobars/infobar_android.h"

#include "chrome/browser/ui/android/infobars/infobar_container_android.h"

@@ -117,7 +118,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{"AppMenuDragHelper", RegisterAppMenuDragHelper},

{"Bookmarks", bookmarks::android::RegisterBookmarks},

{"DomDistiller", dom_distiller::android::RegisterDomDistiller},

- {"ChromeDownloadDelegate", RegisterChromeDownloadDeleagte},

+ {"ChromeDownloadDelegate", RegisterChromeDownloadDelegate},

{"GCMDriver", gcm::android::RegisterGCMDriverJni},

{"Invalidation", invalidation::android::RegisterInvalidationJni},

{"NavigationInterception",

@@ -167,6 +168,8 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{"DomDistillerServiceFactory",

dom_distiller::android::DomDistillerServiceFactoryAndroid::Register},

{"DomDistillerTabUtils", RegisterDomDistillerTabUtils},

+ {"DownloadOverwriteInfoBarDelegate",

+ RegisterDownloadOverwriteInfoBarDelegate},

{"EnhancedBookmarksBridge",

enhanced_bookmarks::android::RegisterEnhancedBookmarksBridge},

{"ExternalPrerenderRequestHandler",