fix download handling for cr62

pre-req for brave/browser-laptop#11326

Author: bridiver

atom/browser/api/atom_api_download_item.cc

@@ -58,7 +58,9 @@ std::map<uint32_t, v8::Global<v8::Object>> g_download_item_objects;
 
 DownloadItem::DownloadItem(v8::Isolate* isolate,
                            content::DownloadItem* download_item)
-    : download_item_(download_item) {
+    : download_item_(download_item),
+      prompt_(download_item->GetTargetDisposition() ==
+          content::DownloadItem::TARGET_DISPOSITION_PROMPT) {
   download_item_->AddObserver(this);
   Init(isolate);
   AttachAsUserData(download_item);
@@ -87,6 +89,10 @@ void DownloadItem::OnDownloadUpdated(content::DownloadItem* item) {
   }
 }
 
+void DownloadItem::OnDownloadRemoved(content::DownloadItem* download) {
+  Emit("removed");
+}
+
 void DownloadItem::OnDownloadDestroyed(content::DownloadItem* download_item) {
   download_item_ = nullptr;
   // Destroy the native class immediately when downloadItem is destroyed.
@@ -111,7 +117,6 @@ bool DownloadItem::CanResume() const {
 
 void DownloadItem::Cancel() {
   download_item_->Cancel(true);
-  download_item_->Remove();
 }
 
 int64_t DownloadItem::GetReceivedBytes() const {
@@ -139,6 +144,10 @@ std::string DownloadItem::GetFilename() const {
                            std::string()).LossyDisplayName());
 }
 
+base::FilePath DownloadItem::GetTargetFilePath() const {
+  return download_item_->GetTargetFilePath();
+}
+
 std::string DownloadItem::GetContentDisposition() const {
   return download_item_->GetContentDisposition();
 }
@@ -163,10 +172,18 @@ base::FilePath DownloadItem::GetSavePath() const {
   return save_path_;
 }
 
-bool DownloadItem::PromptForSaveLocation() const {
-  return download_item_->GetTargetDisposition() ==
-      content::DownloadItem::TARGET_DISPOSITION_PROMPT;
+void DownloadItem::SetPrompt(bool prompt) {
+  prompt_ = prompt;
 }
+
+bool DownloadItem::ShouldPrompt() {
+  return prompt_;
+}
+
+std::string DownloadItem::GetGuid() const {
+  return download_item_->GetGuid();
+}
+
 // static
 void DownloadItem::BuildPrototype(v8::Isolate* isolate,
                                   v8::Local<v8::FunctionTemplate> prototype) {
@@ -183,13 +200,15 @@ void DownloadItem::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("getMimeType", &DownloadItem::GetMimeType)
       .SetMethod("hasUserGesture", &DownloadItem::HasUserGesture)
       .SetMethod("getFilename", &DownloadItem::GetFilename)
+      .SetMethod("getTargetFilePath", &DownloadItem::GetTargetFilePath)
       .SetMethod("getContentDisposition", &DownloadItem::GetContentDisposition)
       .SetMethod("getURL", &DownloadItem::GetURL)
       .SetMethod("getState", &DownloadItem::GetState)
       .SetMethod("isDone", &DownloadItem::IsDone)
       .SetMethod("setSavePath", &DownloadItem::SetSavePath)
       .SetMethod("getSavePath", &DownloadItem::GetSavePath)
-      .SetMethod("promptForSaveLocation", &DownloadItem::PromptForSaveLocation);
+      .SetMethod("getGuid", &DownloadItem::GetGuid)
+      .SetMethod("setPrompt", &DownloadItem::SetPrompt);
 }
 
 // static

atom/browser/api/atom_api_download_item.h

@@ -36,25 +36,30 @@ class DownloadItem : public mate::TrackableObject<DownloadItem>,
   std::string GetMimeType() const;
   bool HasUserGesture() const;
   std::string GetFilename() const;
+  base::FilePath GetTargetFilePath() const;
   std::string GetContentDisposition() const;
   const GURL& GetURL() const;
   content::DownloadItem::DownloadState GetState() const;
   bool IsDone() const;
   void SetSavePath(const base::FilePath& path);
   base::FilePath GetSavePath() const;
-  bool PromptForSaveLocation() const;
+  std::string GetGuid() const;
+  void SetPrompt(bool prompt);
+  bool ShouldPrompt();
 
  protected:
   DownloadItem(v8::Isolate* isolate, content::DownloadItem* download_item);
   ~DownloadItem();
 
   // Override content::DownloadItem::Observer methods
   void OnDownloadUpdated(content::DownloadItem* download) override;
+  void OnDownloadRemoved(content::DownloadItem* download) override;
   void OnDownloadDestroyed(content::DownloadItem* download) override;
 
  private:
   base::FilePath save_path_;
   content::DownloadItem* download_item_;
+  bool prompt_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItem);
 };

atom/browser/api/atom_api_session.cc

@@ -355,6 +355,14 @@ Session::Session(v8::Isolate* isolate, Profile* profile)
   content::BrowserContext::GetDownloadManager(profile)->
       AddObserver(this);
 
+  auto user_prefs_registrar = profile_->user_prefs_change_registrar();
+  if (!user_prefs_registrar->IsObserved(prefs::kDownloadDefaultDirectory)) {
+    user_prefs_registrar->Add(
+        prefs::kDownloadDefaultDirectory,
+        base::Bind(&Session::DefaultDownloadDirectoryChanged,
+                   base::Unretained(this)));
+  }
+
   Init(isolate);
   AttachAsUserData(profile);
 }
@@ -370,6 +378,12 @@ std::string Session::Partition() {
       profile_)->partition_with_prefix();
 }
 
+void Session::DefaultDownloadDirectoryChanged() {
+  base::FilePath default_download_path(profile_->GetPrefs()->GetFilePath(
+      prefs::kDownloadDefaultDirectory));
+  Emit("default-download-directory-changed", default_download_path);
+}
+
 void Session::OnDownloadCreated(content::DownloadManager* manager,
                                 content::DownloadItem* item) {
   if (item->IsSavePackageDownload())
@@ -446,7 +460,7 @@ void Session::SetProxy(const net::ProxyConfig& config,
 }
 
 void Session::SetDownloadPath(const base::FilePath& path) {
-  profile_->prefs()->SetFilePath(
+  profile_->GetPrefs()->SetFilePath(
       prefs::kDownloadDefaultDirectory, path);
 }
 

atom/browser/api/atom_api_session.h

@@ -102,6 +102,8 @@ class Session: public mate::TrackableObject<Session>,
                          content::DownloadItem* item) override;
 
  private:
+  void DefaultDownloadDirectoryChanged();
+
   // Cached object.
   v8::Global<v8::Value> cookies_;
   v8::Global<v8::Value> protocol_;

atom/browser/api/atom_api_web_contents.cc

@@ -10,6 +10,7 @@
 #include "atom/browser/api/atom_api_web_contents.h"
 
 #include "atom/browser/api/atom_api_debugger.h"
+#include "atom/browser/api/atom_api_download_item.h"
 #include "atom/browser/api/atom_api_session.h"
 #include "atom/browser/api/atom_api_web_request.h"
 #include "atom/browser/api/atom_api_window.h"
@@ -125,6 +126,16 @@ using guest_view::GuestViewManager;
 
 namespace mate {
 
+template<>
+struct Converter<content::DownloadItem*> {
+  static v8::Local<v8::Value> ToV8(
+      v8::Isolate* isolate, content::DownloadItem* val) {
+    if (!val)
+      return v8::Null(isolate);
+    return atom::api::DownloadItem::Create(isolate, val).ToV8();
+  }
+};
+
 template<>
 struct Converter<atom::SetSizeParams> {
   static bool FromV8(v8::Isolate* isolate,
@@ -369,7 +380,8 @@ WebContents::WebContents(v8::Isolate* isolate,
       request_id_(0),
       enable_devtools_(true),
       is_being_destroyed_(false),
-      guest_delegate_(nullptr) {
+      guest_delegate_(nullptr),
+      weak_ptr_factory_(this) {
   if (type == REMOTE) {
     Init(isolate);
     AttachAsUserData(web_contents);
@@ -388,7 +400,8 @@ WebContents::WebContents(v8::Isolate* isolate,
     request_id_(0),
     enable_devtools_(true),
     is_being_destroyed_(false),
-    guest_delegate_(nullptr) {
+    guest_delegate_(nullptr),
+    weak_ptr_factory_(this) {
   CreateWebContents(isolate, options, create_params);
 }
 
@@ -397,7 +410,8 @@ WebContents::WebContents(v8::Isolate* isolate, const mate::Dictionary& options)
       request_id_(0),
       enable_devtools_(true),
       is_being_destroyed_(false),
-      guest_delegate_(nullptr) {
+      guest_delegate_(nullptr),
+      weak_ptr_factory_(this) {
   mate::Handle<api::Session> session = SessionFromOptions(isolate, options);
 
   content::WebContents::CreateParams create_params(session->browser_context());
@@ -1604,16 +1618,37 @@ void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
   web_contents()->GetController().LoadURLWithParams(params);
 }
 
+void OnDownloadStarted(base::Callback<void(content::DownloadItem*)> callback,
+                        content::DownloadItem* item,
+                        content::DownloadInterruptReason reason) {
+  content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
+      base::Bind(callback, item));
+}
+
 void WebContents::DownloadURL(const GURL& url,
-                              bool prompt_for_location) {
+                              mate::Arguments* args) {
   auto browser_context = web_contents()->GetBrowserContext();
   auto download_manager =
     content::BrowserContext::GetDownloadManager(browser_context);
 
   auto params = content::DownloadUrlParameters::CreateForWebContentsMainFrame(
           web_contents(), url, NO_TRAFFIC_ANNOTATION_YET);
-  if (prompt_for_location)
-    params->set_prompt(prompt_for_location);
+
+  bool prompt_for_location = false;
+  if (args->GetNext(&prompt_for_location) && prompt_for_location) {
+    prompt_for_location = true;
+  }
+  params->set_prompt(prompt_for_location);
+
+  base::string16 suggested_name;
+  if (args->GetNext(&suggested_name)) {
+    params->set_suggested_name(suggested_name);
+  }
+
+  base::Callback<void(content::DownloadItem*)> callback;
+  if (args && args->GetNext(&callback)) {
+    params->set_callback(base::Bind(OnDownloadStarted, callback));
+  }
 
   download_manager->DownloadUrl(std::move(params));
 }

atom/browser/api/atom_api_web_contents.h

@@ -14,6 +14,7 @@
 #include "atom/browser/common_web_contents_delegate.h"
 #include "atom/common/options_switches.h"
 #include "base/memory/memory_pressure_listener.h"
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "content/common/cursors/webcursor.h"
 #include "content/common/view_messages.h"
@@ -155,7 +156,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
   bool Equal(const WebContents* web_contents) const;
   void LoadURL(const GURL& url, const mate::Dictionary& options);
   void Reload(bool ignore_cache);
-  void DownloadURL(const GURL& url, bool prompt_for_location = false);
+  void DownloadURL(const GURL& url, mate::Arguments* args);
+
   GURL GetURL() const;
   base::string16 GetTitle() const;
   bool IsInitialBlankNavigation() const;
@@ -558,6 +560,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // the context menu params for the current context menu;
   content::ContextMenuParams context_menu_params_;
 
+  base::WeakPtrFactory<WebContents> weak_ptr_factory_;
+
   std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
   DISALLOW_COPY_AND_ASSIGN(WebContents);
 };

atom/browser/atom_browser_context.cc

@@ -155,10 +155,9 @@ std::vector<std::string> AtomBrowserContext::GetCookieableSchemes() {
 void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
   pref_registry->RegisterFilePathPref(prefs::kSelectFileLastDirectory,
                                       base::FilePath());
-  base::FilePath download_dir;
-  PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &download_dir);
+  // moved to user_prefs in brave_browser_context
   pref_registry->RegisterFilePathPref(prefs::kDownloadDefaultDirectory,
-                                      download_dir);
+                                      base::FilePath());
   pref_registry->RegisterDictionaryPref(prefs::kDevToolsFileSystemPaths);
 }