github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-27 16:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #246 from deepak1556/cookie_crypto_patch

Browse Source 
initialize crypto delegate in CookieStoreConfig
This commit is contained in:
Cheng Zhao
2016-09-16 21:26:19 +09:00
committed by GitHub
parent 296e06be1c a56c6b1b79
commit 7917aa8938
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
brightray/brightray.gyp
View File

@@ -99,6 +99,8 @@
'<(libchromiumcontent_dir)/libyuv.a',
'<(libchromiumcontent_dir)/libcdm_renderer.a',
'<(libchromiumcontent_dir)/libsecurity_state.a',
'<(libchromiumcontent_dir)/libcookie_config.a',
'<(libchromiumcontent_dir)/libos_crypt.a',
],
},
}, {
@@ -154,6 +156,8 @@
'<(libchromiumcontent_dir)/libyuv.a',
'<(libchromiumcontent_dir)/libcdm_renderer.a',
'<(libchromiumcontent_dir)/libsecurity_state.a',
'<(libchromiumcontent_dir)/libcookie_config.a',
'<(libchromiumcontent_dir)/libos_crypt.a',
],
},
}, {
@@ -219,6 +223,8 @@
'<(libchromiumcontent_dir)/libyuv.lib',
'<(libchromiumcontent_dir)/cdm_renderer.lib',
'<(libchromiumcontent_dir)/security_state.lib',
'<(libchromiumcontent_dir)/cookie_config.lib',
'<(libchromiumcontent_dir)/os_crypt.lib',
# Friends of pdf.lib:
'<(libchromiumcontent_dir)/pdf.lib',
'<(libchromiumcontent_dir)/ppapi_cpp_objects.lib',

2
brightray/browser/url_request_context_getter.cc
View File

@@ -17,6 +17,7 @@
#include "base/strings/string_util.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/threading/worker_pool.h"
#include "components/cookie_config/cookie_store_util.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/cookie_store_factory.h"
#include "content/public/common/content_switches.h"
@@ -187,6 +188,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES,
nullptr, nullptr);
cookie_config.cookieable_schemes = delegate_->GetCookieableSchemes();
cookie_config.crypto_delegate = cookie_config::GetCookieCryptoDelegate();
cookie_store = content::CreateCookieStore(cookie_config);
}
storage_->set_cookie_store(std::move(cookie_store));