diff options
author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 17:50:18 +0000 |
---|---|---|
committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 17:50:18 +0000 |
commit | e9fbb9350248394b584934cb735b5506e4f164d6 (patch) | |
tree | 7b0cb8669e8305a179333379a114928815dd421f /content/browser/android/download_controller.cc | |
parent | 583eb026cd10f3e42db09893ea24c43c80ced8ac (diff) | |
download | chromium_src-e9fbb9350248394b584934cb735b5506e4f164d6.zip chromium_src-e9fbb9350248394b584934cb735b5506e4f164d6.tar.gz chromium_src-e9fbb9350248394b584934cb735b5506e4f164d6.tar.bz2 |
Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders."
This reverts commit 331b803f65e8f994f9148024e8c2be6b465c6a6e.
TBR=ericu@chromium.org
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10696173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android/download_controller.cc')
-rw-r--r-- | content/browser/android/download_controller.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/content/browser/android/download_controller.cc b/content/browser/android/download_controller.cc index ccd3996..ca6b90a 100644 --- a/content/browser/android/download_controller.cc +++ b/content/browser/android/download_controller.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "content/browser/android/content_view_core_impl.h" #include "content/browser/download/download_item_impl.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/renderer_host/render_view_host_delegate.h" @@ -218,7 +219,7 @@ void DownloadController::OnPostDownloadStarted( // Register for updates to the DownloadItem. download_item->AddObserver(this); - jobject view = GetContentViewFromWebContents(web_contents); + jobject view = GetContentViewCoreFromWebContents(web_contents); if(!view) { // The view went away. Can't proceed. return; @@ -245,14 +246,14 @@ void DownloadController::OnDownloadUpdated(DownloadItem* item) { ScopedJavaLocalRef<jstring> jpath = ConvertUTF8ToJavaString(env, item->GetFullPath().value()); - jobject view = GetContentViewFromWebContents(item->GetWebContents()); - if(!view) { + jobject view_core = GetContentViewCoreFromWebContents(item->GetWebContents()); + if (!view_core) { // We can get NULL WebContents from the DownloadItem. return; } Java_DownloadController_onHttpPostDownloadCompleted(env, - GetJavaObject()->Controller(env).obj(), view, jurl.obj(), + GetJavaObject()->Controller(env).obj(), view_core, jurl.obj(), jcontent_disposition.obj(), jmime_type.obj(), jpath.obj(), item->GetReceivedBytes(), true); } @@ -274,10 +275,10 @@ jobject DownloadController::GetContentView(int render_process_id, if (!web_contents) return NULL; - return GetContentViewFromWebContents(web_contents); + return GetContentViewCoreFromWebContents(web_contents); } -jobject DownloadController::GetContentViewFromWebContents( +jobject DownloadController::GetContentViewCoreFromWebContents( WebContents* web_contents) { NOTIMPLEMENTED(); return NULL; |