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

Unified Diff: chrome/browser/download/download_target_determiner.cc

Issue 1229933010: move file access permission logic to DownloadResourceThrottle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing asanka's comments Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/download/download_target_determiner.cc
diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
index 38e0acb95a31500c4e38f5c7f0343a6d1cee1e22..99bcd7f1e855e09c96b958c6277aeda025c8f3dd 100644
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -39,10 +39,6 @@
#include "content/public/common/webplugininfo.h"
#endif
-#if defined(OS_ANDROID)
-#include "content/public/browser/android/download_controller_android.h"
-#endif
-
#if defined(OS_WIN)
#include "chrome/browser/ui/pdf/adobe_reader_info_win.h"
#endif
@@ -90,7 +86,7 @@ DownloadTargetDeterminer::DownloadTargetDeterminer(
DownloadPrefs* download_prefs,
DownloadTargetDeterminerDelegate* delegate,
const CompletionCallback& callback)
- : next_state_(STATE_PROMPT_USER_FOR_PERMISSION),
+ : next_state_(STATE_GENERATE_TARGET_PATH),
should_prompt_(false),
should_notify_extensions_(false),
create_target_directory_(false),
@@ -129,9 +125,6 @@ void DownloadTargetDeterminer::DoLoop() {
next_state_ = STATE_NONE;
switch (current_state) {
- case STATE_PROMPT_USER_FOR_PERMISSION:
- result = DoPromptUserForPermission();
- break;
case STATE_GENERATE_TARGET_PATH:
result = DoGenerateTargetPath();
break;
@@ -179,35 +172,6 @@ void DownloadTargetDeterminer::DoLoop() {
}
DownloadTargetDeterminer::Result
- DownloadTargetDeterminer::DoPromptUserForPermission() {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- next_state_ = STATE_GENERATE_TARGET_PATH;
-#if defined(OS_ANDROID)
- content::WebContents* web_contents = download_->GetWebContents();
- content::DownloadControllerAndroid::Get()->AcquireFileAccessPermission(
- web_contents,
- base::Bind(&DownloadTargetDeterminer::PromptUserForPermissionDone,
- weak_ptr_factory_.GetWeakPtr()));
- return QUIT_DOLOOP;
-#else
- return CONTINUE;
-#endif
-}
-
-#if defined(OS_ANDROID)
-void DownloadTargetDeterminer::PromptUserForPermissionDone(bool granted) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- DCHECK_EQ(STATE_GENERATE_TARGET_PATH, next_state_);
- if (!granted) {
- CancelOnFailureAndDeleteSelf();
- return;
- }
-
- DoLoop();
-}
-#endif
-
-DownloadTargetDeterminer::Result
DownloadTargetDeterminer::DoGenerateTargetPath() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(local_path_.empty());

Powered by Google App Engine
This is Rietveld 408576698