- Add download handling support via new CefDownloadHandler and CefDownloadItem interfaces (issue #516).

- Fix setting of CefKeyEvent.focus_on_editable_field when the underlying RenderViewHost changes.
- Fix potential crash if URLRequest objects are still in-progress upon shutdown.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@715 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

tests/cefclient/client_handler.cpp

@@ -179,6 +179,27 @@ bool ClientHandler::OnConsoleMessage(CefRefPtr<CefBrowser> browser,
   return false;
 }
 
+void ClientHandler::OnBeforeDownload(
+    CefRefPtr<CefBrowser> browser,
+    CefRefPtr<CefDownloadItem> download_item,
+    const CefString& suggested_name,
+    CefRefPtr<CefBeforeDownloadCallback> callback) {
+  REQUIRE_UI_THREAD();
+  // Continue the download and show the "Save As" dialog.
+  callback->Continue(GetDownloadPath(suggested_name), true);
+}
+
+void ClientHandler::OnDownloadUpdated(
+    CefRefPtr<CefBrowser> browser,
+    CefRefPtr<CefDownloadItem> download_item,
+    CefRefPtr<CefDownloadItemCallback> callback) {
+  REQUIRE_UI_THREAD();
+  if (download_item->IsComplete()) {
+    SetLastDownloadFile(download_item->GetFullPath());
+    SendNotification(NOTIFY_DOWNLOAD_COMPLETE);
+  }
+}
+
 void ClientHandler::OnRequestGeolocationPermission(
       CefRefPtr<CefBrowser> browser,
       const CefString& requesting_url,

tests/cefclient/client_handler.h

@@ -22,6 +22,7 @@
 class ClientHandler : public CefClient,
                       public CefContextMenuHandler,
                       public CefDisplayHandler,
+                      public CefDownloadHandler,
                       public CefGeolocationHandler,
                       public CefKeyboardHandler,
                       public CefLifeSpanHandler,
@@ -74,6 +75,9 @@ class ClientHandler : public CefClient,
   virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() OVERRIDE {
     return this;
   }
+  virtual CefRefPtr<CefDownloadHandler> GetDownloadHandler() OVERRIDE {
+    return this;
+  }
   virtual CefRefPtr<CefGeolocationHandler> GetGeolocationHandler() OVERRIDE {
     return this;
   }
@@ -120,6 +124,17 @@ class ClientHandler : public CefClient,
                                 const CefString& source,
                                 int line) OVERRIDE;
 
+  // CefDownloadHandler methods
+  virtual void OnBeforeDownload(
+      CefRefPtr<CefBrowser> browser,
+      CefRefPtr<CefDownloadItem> download_item,
+      const CefString& suggested_name,
+      CefRefPtr<CefBeforeDownloadCallback> callback) OVERRIDE;
+  virtual void OnDownloadUpdated(
+      CefRefPtr<CefBrowser> browser,
+      CefRefPtr<CefDownloadItem> download_item,
+      CefRefPtr<CefDownloadItemCallback> callback) OVERRIDE;
+
   // CefGeolocationHandler methods
   virtual void OnRequestGeolocationPermission(
       CefRefPtr<CefBrowser> browser,
@@ -215,6 +230,10 @@ class ClientHandler : public CefClient,
     int radio_item;
   } m_TestMenuState;
 
+  // Returns the full download path for the specified file, or an empty path to
+  // use the default temp directory.
+  std::string GetDownloadPath(const std::string& file_name);
+
   // The child browser window
   CefRefPtr<CefBrowser> m_Browser;
 

tests/cefclient/client_handler_gtk.cpp

@@ -57,3 +57,7 @@ void ClientHandler::SetNavState(bool canGoBack, bool canGoForward) {
 void ClientHandler::CloseMainWindow() {
   // TODO(port): Close main window.
 }
+
+std::string ClientHandler::GetDownloadPath(const std::string& file_name) {
+  return std::string();
+}

tests/cefclient/client_handler_mac.mm

@@ -68,3 +68,7 @@ void ClientHandler::SetNavState(bool canGoBack, bool canGoForward) {
 void ClientHandler::CloseMainWindow() {
   // TODO(port): Close window
 }
+
+std::string ClientHandler::GetDownloadPath(const std::string& file_name) {
+  return std::string();
+}

tests/cefclient/client_handler_win.cpp

@@ -3,7 +3,11 @@
 // can be found in the LICENSE file.
 
 #include "cefclient/client_handler.h"
+
 #include <string>
+#include <windows.h>
+#include <shlobj.h> 
+
 #include "include/cef_browser.h"
 #include "include/cef_frame.h"
 #include "cefclient/resource.h"
@@ -66,3 +70,17 @@ void ClientHandler::SetNavState(bool canGoBack, bool canGoForward) {
 void ClientHandler::CloseMainWindow() {
   ::PostMessage(m_MainHwnd, WM_CLOSE, 0, 0);
 }
+
+std::string ClientHandler::GetDownloadPath(const std::string& file_name) {
+  TCHAR szFolderPath[MAX_PATH];
+  std::string path;
+
+  // Save the file in the user's "My Documents" folder.
+  if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL | CSIDL_FLAG_CREATE,
+                                NULL, 0, szFolderPath))) {
+    path = CefString(szFolderPath);
+    path += "\\" + file_name;
+  }
+
+  return path;
+}