chrome/browser/download/download_resource_throttle.cc - Issue 2014803002: Move DownloadControllerAndroid from content/ to chrome/

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/download/download_resource_throttle.cc

Issue 2014803002: Move DownloadControllerAndroid from content/ to chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix failing tests/bugs Created 4 years, 6 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

« no previous file with comments | « chrome/browser/android/intercept_download_resource_throttle.cc ('k') | chrome/browser/download/download_resource_throttle_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/download/download_resource_throttle.cc

diff --git a/chrome/browser/download/download_resource_throttle.cc b/chrome/browser/download/download_resource_throttle.cc

index 6fab62091bbc0c2694cc3d08c430943a3c852a1c..68c4bae609f81b48560e5b06fb9f3c5923858233 100644

--- a/chrome/browser/download/download_resource_throttle.cc

+++ b/chrome/browser/download/download_resource_throttle.cc

@@ -13,10 +13,8 @@

#include "content/public/browser/resource_controller.h"

#if defined(OS_ANDROID)

-#include "content/public/browser/android/download_controller_android.h"

+#include "chrome/browser/android/download/download_controller_base.h"

#include "content/public/browser/render_view_host.h"

-using content::DownloadControllerAndroid;

#endif

using content::BrowserThread;

@@ -55,7 +53,7 @@ void CanDownloadOnUIThread(

#if defined(OS_ANDROID)

content::WebContents* contents = info->web_contents_getter.Run();

if (contents) {

- content::DownloadControllerAndroid::Get()->AcquireFileAccessPermission(

+ DownloadControllerBase::Get()->AcquireFileAccessPermission(

contents, base::Bind(&OnAcquireFileAccessPermissionDone,

base::Passed(std::move(info))));

} else {