Add the ability to persist session cookies (issue #881).

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

libcef_dll/cpptoc/completion_handler_cpptoc.cc

@@ -0,0 +1,44 @@
+// Copyright (c) 2013 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. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#include "libcef_dll/cpptoc/completion_handler_cpptoc.h"
+
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+void CEF_CALLBACK completion_handler_on_complete(
+    struct _cef_completion_handler_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+
+  // Execute
+  CefCompletionHandlerCppToC::Get(self)->OnComplete();
+}
+
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefCompletionHandlerCppToC::CefCompletionHandlerCppToC(
+    CefCompletionHandler* cls)
+    : CefCppToC<CefCompletionHandlerCppToC, CefCompletionHandler,
+        cef_completion_handler_t>(cls) {
+  struct_.struct_.on_complete = completion_handler_on_complete;
+}
+
+#ifndef NDEBUG
+template<> long CefCppToC<CefCompletionHandlerCppToC, CefCompletionHandler,
+    cef_completion_handler_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/cpptoc/completion_handler_cpptoc.h

@@ -0,0 +1,37 @@
+// Copyright (c) 2013 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. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#ifndef CEF_LIBCEF_DLL_CPPTOC_COMPLETION_HANDLER_CPPTOC_H_
+#define CEF_LIBCEF_DLL_CPPTOC_COMPLETION_HANDLER_CPPTOC_H_
+#pragma once
+
+#ifndef USING_CEF_SHARED
+#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
+#else  // USING_CEF_SHARED
+
+#include "include/cef_callback.h"
+#include "include/capi/cef_callback_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 CefCompletionHandlerCppToC
+    : public CefCppToC<CefCompletionHandlerCppToC, CefCompletionHandler,
+        cef_completion_handler_t> {
+ public:
+  explicit CefCompletionHandlerCppToC(CefCompletionHandler* cls);
+  virtual ~CefCompletionHandlerCppToC() {}
+};
+
+#endif  // USING_CEF_SHARED
+#endif  // CEF_LIBCEF_DLL_CPPTOC_COMPLETION_HANDLER_CPPTOC_H_
+

libcef_dll/cpptoc/cookie_manager_cpptoc.cc

@@ -11,6 +11,7 @@
 //
 
 #include "libcef_dll/cpptoc/cookie_manager_cpptoc.h"
+#include "libcef_dll/ctocpp/completion_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/cookie_visitor_ctocpp.h"
 #include "libcef_dll/transfer_util.h"
 
@@ -28,14 +29,15 @@ CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_get_global_manager() {
 }
 
 CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_create_manager(
-    const cef_string_t* path) {
+    const cef_string_t* path, int persist_session_cookies) {
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
 
   // Unverified params: path
 
   // Execute
   CefRefPtr<CefCookieManager> _retval = CefCookieManager::CreateManager(
-      CefString(path));
+      CefString(path),
+      persist_session_cookies?true:false);
 
   // Return type: refptr_same
   return CefCookieManagerCppToC::Wrap(_retval);
@@ -163,7 +165,8 @@ int CEF_CALLBACK cookie_manager_delete_cookies(
 }
 
 int CEF_CALLBACK cookie_manager_set_storage_path(
-    struct _cef_cookie_manager_t* self, const cef_string_t* path) {
+    struct _cef_cookie_manager_t* self, const cef_string_t* path,
+    int persist_session_cookies) {
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
 
   DCHECK(self);
@@ -173,7 +176,25 @@ int CEF_CALLBACK cookie_manager_set_storage_path(
 
   // Execute
   bool _retval = CefCookieManagerCppToC::Get(self)->SetStoragePath(
-      CefString(path));
+      CefString(path),
+      persist_session_cookies?true:false);
+
+  // Return type: bool
+  return _retval;
+}
+
+int CEF_CALLBACK cookie_manager_flush_store(struct _cef_cookie_manager_t* self,
+    cef_completion_handler_t* handler) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+  // Unverified params: handler
+
+  // Execute
+  bool _retval = CefCookieManagerCppToC::Get(self)->FlushStore(
+      CefCompletionHandlerCToCpp::Wrap(handler));
 
   // Return type: bool
   return _retval;
@@ -191,6 +212,7 @@ CefCookieManagerCppToC::CefCookieManagerCppToC(CefCookieManager* cls)
   struct_.struct_.set_cookie = cookie_manager_set_cookie;
   struct_.struct_.delete_cookies = cookie_manager_delete_cookies;
   struct_.struct_.set_storage_path = cookie_manager_set_storage_path;
+  struct_.struct_.flush_store = cookie_manager_flush_store;
 }
 
 #ifndef NDEBUG

libcef_dll/ctocpp/completion_handler_ctocpp.cc

@@ -0,0 +1,33 @@
+// Copyright (c) 2013 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. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#include "libcef_dll/ctocpp/completion_handler_ctocpp.h"
+
+
+// VIRTUAL METHODS - Body may be edited by hand.
+
+void CefCompletionHandlerCToCpp::OnComplete() {
+  if (CEF_MEMBER_MISSING(struct_, on_complete))
+    return;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Execute
+  struct_->on_complete(struct_);
+}
+
+
+#ifndef NDEBUG
+template<> long CefCToCpp<CefCompletionHandlerCToCpp, CefCompletionHandler,
+    cef_completion_handler_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/ctocpp/completion_handler_ctocpp.h

@@ -0,0 +1,42 @@
+// Copyright (c) 2013 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. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#ifndef CEF_LIBCEF_DLL_CTOCPP_COMPLETION_HANDLER_CTOCPP_H_
+#define CEF_LIBCEF_DLL_CTOCPP_COMPLETION_HANDLER_CTOCPP_H_
+#pragma once
+
+#ifndef BUILDING_CEF_SHARED
+#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
+#else  // BUILDING_CEF_SHARED
+
+#include "include/cef_callback.h"
+#include "include/capi/cef_callback_capi.h"
+#include "libcef_dll/ctocpp/ctocpp.h"
+
+// Wrap a C structure with a C++ class.
+// This class may be instantiated and accessed DLL-side only.
+class CefCompletionHandlerCToCpp
+    : public CefCToCpp<CefCompletionHandlerCToCpp, CefCompletionHandler,
+        cef_completion_handler_t> {
+ public:
+  explicit CefCompletionHandlerCToCpp(cef_completion_handler_t* str)
+      : CefCToCpp<CefCompletionHandlerCToCpp, CefCompletionHandler,
+          cef_completion_handler_t>(str) {}
+  virtual ~CefCompletionHandlerCToCpp() {}
+
+  // CefCompletionHandler methods
+  virtual void OnComplete() OVERRIDE;
+};
+
+#endif  // BUILDING_CEF_SHARED
+#endif  // CEF_LIBCEF_DLL_CTOCPP_COMPLETION_HANDLER_CTOCPP_H_
+

libcef_dll/ctocpp/cookie_manager_ctocpp.cc

@@ -10,6 +10,7 @@
 // for more information.
 //
 
+#include "libcef_dll/cpptoc/completion_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/cookie_visitor_cpptoc.h"
 #include "libcef_dll/ctocpp/cookie_manager_ctocpp.h"
 #include "libcef_dll/transfer_util.h"
@@ -28,14 +29,15 @@ CefRefPtr<CefCookieManager> CefCookieManager::GetGlobalManager() {
 }
 
 CefRefPtr<CefCookieManager> CefCookieManager::CreateManager(
-    const CefString& path) {
+    const CefString& path, bool persist_session_cookies) {
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
 
   // Unverified params: path
 
   // Execute
   cef_cookie_manager_t* _retval = cef_cookie_manager_create_manager(
-      path.GetStruct());
+      path.GetStruct(),
+      persist_session_cookies);
 
   // Return type: refptr_same
   return CefCookieManagerCToCpp::Wrap(_retval);
@@ -151,7 +153,8 @@ bool CefCookieManagerCToCpp::DeleteCookies(const CefString& url,
   return _retval?true:false;
 }
 
-bool CefCookieManagerCToCpp::SetStoragePath(const CefString& path) {
+bool CefCookieManagerCToCpp::SetStoragePath(const CefString& path,
+    bool persist_session_cookies) {
   if (CEF_MEMBER_MISSING(struct_, set_storage_path))
     return false;
 
@@ -161,7 +164,25 @@ bool CefCookieManagerCToCpp::SetStoragePath(const CefString& path) {
 
   // Execute
   int _retval = struct_->set_storage_path(struct_,
-      path.GetStruct());
+      path.GetStruct(),
+      persist_session_cookies);
+
+  // Return type: bool
+  return _retval?true:false;
+}
+
+bool CefCookieManagerCToCpp::FlushStore(
+    CefRefPtr<CefCompletionHandler> handler) {
+  if (CEF_MEMBER_MISSING(struct_, flush_store))
+    return false;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Unverified params: handler
+
+  // Execute
+  int _retval = struct_->flush_store(struct_,
+      CefCompletionHandlerCppToC::Wrap(handler));
 
   // Return type: bool
   return _retval?true:false;

libcef_dll/ctocpp/cookie_manager_ctocpp.h

@@ -44,7 +44,9 @@ class CefCookieManagerCToCpp
       const CefCookie& cookie) OVERRIDE;
   virtual bool DeleteCookies(const CefString& url,
       const CefString& cookie_name) OVERRIDE;
-  virtual bool SetStoragePath(const CefString& path) OVERRIDE;
+  virtual bool SetStoragePath(const CefString& path,
+      bool persist_session_cookies) OVERRIDE;
+  virtual bool FlushStore(CefRefPtr<CefCompletionHandler> handler) OVERRIDE;
 };
 
 #endif  // USING_CEF_SHARED

libcef_dll/libcef_dll.cc

@@ -70,6 +70,7 @@
 #include "libcef_dll/cpptoc/zip_reader_cpptoc.h"
 #include "libcef_dll/ctocpp/app_ctocpp.h"
 #include "libcef_dll/ctocpp/browser_process_handler_ctocpp.h"
+#include "libcef_dll/ctocpp/completion_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/context_menu_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/cookie_visitor_ctocpp.h"
 #include "libcef_dll/ctocpp/domevent_listener_ctocpp.h"
@@ -177,6 +178,7 @@ CEF_EXPORT void cef_shutdown() {
   DCHECK_EQ(CefBrowserHostCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefBrowserProcessHandlerCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefCallbackCppToC::DebugObjCt, 0);
+  DCHECK_EQ(CefCompletionHandlerCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefContextMenuHandlerCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefContextMenuParamsCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefCookieManagerCppToC::DebugObjCt, 0);

libcef_dll/wrapper/libcef_dll_wrapper.cc

@@ -35,6 +35,7 @@
 #include "include/cef_version.h"
 #include "libcef_dll/cpptoc/app_cpptoc.h"
 #include "libcef_dll/cpptoc/browser_process_handler_cpptoc.h"
+#include "libcef_dll/cpptoc/completion_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/context_menu_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/cookie_visitor_cpptoc.h"
 #include "libcef_dll/cpptoc/domevent_listener_cpptoc.h"
@@ -169,6 +170,7 @@ CEF_GLOBAL void CefShutdown() {
   DCHECK_EQ(CefBrowserHostCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefBrowserProcessHandlerCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefCallbackCToCpp::DebugObjCt, 0);
+  DCHECK_EQ(CefCompletionHandlerCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefContextMenuHandlerCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefContextMenuParamsCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefCookieManagerCToCpp::DebugObjCt, 0);