- Add the CefHandler::HandleDownloadResponse() method and CefDownloadHandler class to support file download in response to 'Content-Disposition' headers (issue #6).

- Fix parsing error in cef_parser.py due to space between angle brackets in template type definitions, and add support for int64 type.
- Update copyright messages in Python and generated files.

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

libcef_dll/cpptoc/browser_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/browser_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/download_handler_cpptoc.cc

@@ -0,0 +1,53 @@
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// A portion of this file was generated by the CEF translator tool.  When
+// making changes by hand only do so within the body of existing function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#include "libcef_dll/cpptoc/download_handler_cpptoc.h"
+
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+int CEF_CALLBACK download_handler_received_data(
+    struct _cef_download_handler_t* self, void* data, int data_size)
+{
+  DCHECK(self);
+  if(!self)
+    return 0;
+
+  return CefDownloadHandlerCppToC::Get(self)->ReceivedData(data, data_size);
+}
+
+void CEF_CALLBACK download_handler_complete(
+    struct _cef_download_handler_t* self)
+{
+  DCHECK(self);
+  if(!self)
+    return;
+
+  CefDownloadHandlerCppToC::Get(self)->Complete();
+}
+
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefDownloadHandlerCppToC::CefDownloadHandlerCppToC(CefDownloadHandler* cls)
+    : CefCppToC<CefDownloadHandlerCppToC, CefDownloadHandler,
+        cef_download_handler_t>(cls)
+{
+  struct_.struct_.received_data = download_handler_received_data;
+  struct_.struct_.complete = download_handler_complete;
+}
+
+#ifdef _DEBUG
+long CefCppToC<CefDownloadHandlerCppToC, CefDownloadHandler,
+    cef_download_handler_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/cpptoc/download_handler_cpptoc.h

@@ -0,0 +1,35 @@
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool and should not edited
+// by hand. See the translator.README.txt file in the tools directory for
+// more information.
+//
+#ifndef _DOWNLOADHANDLER_CPPTOC_H
+#define _DOWNLOADHANDLER_CPPTOC_H
+
+#ifndef USING_CEF_SHARED
+#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
+#else // USING_CEF_SHARED
+
+#include "include/cef.h"
+#include "include/cef_capi.h"
+#include "libcef_dll/cpptoc/cpptoc.h"
+
+// Wrap a C++ class with a C structure.
+// This class may be instantiated and accessed wrapper-side only.
+class CefDownloadHandlerCppToC
+    : public CefCppToC<CefDownloadHandlerCppToC, CefDownloadHandler,
+        cef_download_handler_t>
+{
+public:
+  CefDownloadHandlerCppToC(CefDownloadHandler* cls);
+  virtual ~CefDownloadHandlerCppToC() {}
+};
+
+#endif // USING_CEF_SHARED
+#endif // _DOWNLOADHANDLER_CPPTOC_H
+

libcef_dll/cpptoc/frame_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/frame_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/handler_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //
@@ -10,6 +10,7 @@
 // for more information.
 //
 
+#include "libcef_dll/cpptoc/download_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/handler_cpptoc.h"
 #include "libcef_dll/ctocpp/browser_ctocpp.h"
 #include "libcef_dll/ctocpp/frame_ctocpp.h"
@@ -228,6 +229,36 @@ enum cef_retval_t CEF_CALLBACK handler_handle_before_resource_load(
   return rv;
 }
 
+enum cef_retval_t CEF_CALLBACK handler_handle_download_response(
+    struct _cef_handler_t* self, cef_browser_t* browser,
+    const wchar_t* mimeType, const wchar_t* fileName, int64 contentLength,
+    struct _cef_download_handler_t** handler)
+{
+  DCHECK(self);
+  DCHECK(browser);
+  DCHECK(mimeType);
+  DCHECK(fileName);
+  if(!self || !browser || !mimeType || !fileName)
+    return RV_CONTINUE;
+
+  std::wstring mimeTypeStr, fileNameStr;
+  CefRefPtr<CefDownloadHandler> downloadPtr;
+
+  if(mimeType)
+    mimeTypeStr = mimeType;
+  if(fileName)
+    fileNameStr = fileName;
+
+  enum cef_retval_t rv = CefHandlerCppToC::Get(self)->
+      HandleDownloadResponse(CefBrowserCToCpp::Wrap(browser), mimeTypeStr,
+      fileNameStr, contentLength, downloadPtr);
+
+  if(downloadPtr.get())
+    *handler = CefDownloadHandlerCppToC::Wrap(downloadPtr);
+
+  return rv;
+}
+
 enum cef_retval_t CEF_CALLBACK handler_handle_before_menu(
     struct _cef_handler_t* self, cef_browser_t* browser,
     const cef_handler_menuinfo_t* menuInfo)
@@ -559,6 +590,7 @@ CefHandlerCppToC::CefHandlerCppToC(CefHandler* cls)
   struct_.struct_.handle_load_error = handler_handle_load_error;
   struct_.struct_.handle_before_resource_load =
       handler_handle_before_resource_load;
+  struct_.struct_.handle_download_response = handler_handle_download_response;
   struct_.struct_.handle_before_menu = handler_handle_before_menu;
   struct_.struct_.handle_get_menu_label = handler_handle_get_menu_label;
   struct_.struct_.handle_menu_action = handler_handle_menu_action;

libcef_dll/cpptoc/handler_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/post_data_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/post_data_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/post_data_element_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/post_data_element_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/read_handler_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/read_handler_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/request_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/request_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/scheme_handler_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/scheme_handler_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/stream_reader_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/stream_reader_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/stream_writer_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/stream_writer_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/task_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/task_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/v8handler_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/v8handler_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/v8value_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/v8value_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/write_handler_cpptoc.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //

libcef_dll/cpptoc/write_handler_cpptoc.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 //