[Android] Prompt with infobar on filename conflict

chrome/browser/download/chrome_download_manager_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 31 matching lines @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/page_navigator.h"
 #include "net/base/filename_util.h"
 #include "net/base/mime_util.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/download_overwrite_infobar_delegate.h"
+#include "chrome/browser/infobars/infobar_service.h"
+#endif
+
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/drive/download_handler.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/api/downloads/downloads_api.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "extensions/browser/notification_types.h"
@@ skipping 504 matching lines @@
       create_directory,
       conflict_action,
       callback);
 }
 
 void ChromeDownloadManagerDelegate::PromptUserForDownloadPath(
     DownloadItem* download,
     const base::FilePath& suggested_path,
     const DownloadTargetDeterminerDelegate::FileSelectedCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+#if defined(OS_ANDROID)
+  content::WebContents* web_contents = download->GetWebContents();
+  if (!web_contents)

[Peter Kasting, 2015/02/18 21:32:29]

When can this conditional be true?  Please add comments (e.g. "May be NULL when
testing") or remove if it can't actually be true.

[Changwan Ryu, 2015/02/19 07:41:15]

Removed

+    return;
+
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents);

[Peter Kasting, 2015/02/18 21:32:29]

Nit: Just inline this into the call below.

[Changwan Ryu, 2015/02/19 07:41:15]

Done.

+
+  chrome::android::DownloadOverwriteInfoBarDelegate::Create(
+      infobar_service, suggested_path, callback);
+#else
   DownloadFilePicker::ShowFilePicker(download, suggested_path, callback);
+#endif
 }
 
 void ChromeDownloadManagerDelegate::DetermineLocalPath(
     DownloadItem* download,
     const base::FilePath& virtual_path,
     const DownloadTargetDeterminerDelegate::LocalPathCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(OS_CHROMEOS)
   drive::DownloadHandler* drive_download_handler =
       drive::DownloadHandler::GetForProfile(profile_);
@@ skipping 153 matching lines @@
       path.MatchesExtension(FILE_PATH_LITERAL(".xht")) ||
       path.MatchesExtension(FILE_PATH_LITERAL(".xhtm")) ||
       path.MatchesExtension(FILE_PATH_LITERAL(".xhtml")) ||
       path.MatchesExtension(FILE_PATH_LITERAL(".xsl")) ||
       path.MatchesExtension(FILE_PATH_LITERAL(".xslt"))) {
     return true;
   }
 #endif
   return false;
 }