mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix some more compilation errors

Browse source
This commit is contained in:
Shelley Vohr 2017-11-23 11:25:12 +01:00 • committed by Cheng Zhao
parent 6a61ec7763
commit 233679865b
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
brightray/browser/url_request_context_getter.cc
View file

@ -100,8 +100,7 @@ URLRequestContextGetter::Delegate::CreateHttpCacheBackendFactory(
net::DISK_CACHE, net::DISK_CACHE,
net::CACHE_BACKEND_DEFAULT, net::CACHE_BACKEND_DEFAULT,
cache_path, cache_path,
max_size, max_size);
BrowserThread::GetTaskRunnerForThread(BrowserThread::CACHE));
} }
std::unique_ptr<net::CertVerifier> std::unique_ptr<net::CertVerifier>
@ -184,8 +183,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
auto cookie_config = content::CookieStoreConfig( auto cookie_config = content::CookieStoreConfig(
cookie_path, cookie_path,
content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES, content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES,
nullptr, nullptr);
delegate_->CreateCookieDelegate());
cookie_config.cookieable_schemes = delegate_->GetCookieableSchemes(); cookie_config.cookieable_schemes = delegate_->GetCookieableSchemes();
std::unique_ptr<net::CookieStore> cookie_store = std::unique_ptr<net::CookieStore> cookie_store =
content::CreateCookieStore(cookie_config); content::CreateCookieStore(cookie_config);

4
brightray/browser/url_request_context_getter.h
View file

@ -12,6 +12,7 @@
#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_context.h"
#include "content/public/browser/content_browser_client.h" #include "content/public/browser/content_browser_client.h"
#include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_monster.h"
#include "net/cookies/cookie_store.h"
#include "net/http/http_cache.h" #include "net/http/http_cache.h"
#include "net/http/transport_security_state.h" #include "net/http/transport_security_state.h"
#include "net/http/url_security_manager.h" #include "net/http/url_security_manager.h"
@ -48,9 +49,6 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
virtual std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() { virtual std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() {
return nullptr; return nullptr;
} }
virtual net::CookieMonsterDelegate* CreateCookieDelegate() {
return nullptr;
}
virtual std::string GetUserAgent(); virtual std::string GetUserAgent();
virtual std::unique_ptr<net::URLRequestJobFactory> virtual std::unique_ptr<net::URLRequestJobFactory>
CreateURLRequestJobFactory(content::ProtocolHandlerMap* protocol_handlers); CreateURLRequestJobFactory(content::ProtocolHandlerMap* protocol_handlers);