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

Unified Diff: chrome/browser/android/tab_android.cc

Issue 2014803002: Move DownloadControllerAndroid from content/ to chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved DownloadControllerAndroid(Impl) to chrome/ 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
Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 17a4440f4b5c94931910ae28b6822272d0009592..527d81eb05dc7b00540f7180ae766879e03ef4fd 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -14,6 +14,7 @@
#include "base/trace_event/trace_event.h"
#include "cc/layers/layer.h"
#include "chrome/browser/android/compositor/tab_content_manager.h"
+#include "chrome/browser/android/download/chrome_download_delegate.h"
#include "chrome/browser/android/metrics/uma_utils.h"
#include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
#include "chrome/browser/android/offline_pages/offline_page_utils.h"
@@ -379,6 +380,7 @@ void TabAndroid::InitWebContents(
jboolean incognito,
const JavaParamRef<jobject>& jcontent_view_core,
const JavaParamRef<jobject>& jweb_contents_delegate,
+ const JavaParamRef<jobject>& jdownload_delegate,
const JavaParamRef<jobject>& jcontext_menu_populator) {
content::ContentViewCore* content_view_core =
content::ContentViewCore::GetNativeContentViewCore(env,
@@ -399,6 +401,8 @@ void TabAndroid::InitWebContents(
SetViewAndroid(content_view_core);
CoreTabHelper::FromWebContents(web_contents())->set_delegate(this);
SearchTabHelper::FromWebContents(web_contents())->set_delegate(this);
+ ChromeDownloadDelegate::FromWebContents(web_contents())->
+ SetDelegate(env, jdownload_delegate);
no sievers 2016/06/07 21:35:23 nit: I'd call this Init() or something instead of
Jinsuk Kim 2016/06/08 06:29:08 Done.
web_contents_delegate_.reset(
new chrome::android::TabWebContentsDelegateAndroid(
env, jweb_contents_delegate));

Powered by Google App Engine
This is Rietveld 408576698