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

No more GetCookieMonster

Browse source
This commit is contained in:
Brian R. Bondy 2016-04-27 13:40:20 -04:00 committed by Cheng Zhao
parent dc7928021d
commit 93e9cf4ac1
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
atom/browser/api/atom_api_cookies.cc
View file

@ -133,12 +133,11 @@ void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
auto filtered_callback = auto filtered_callback =
base::Bind(FilterCookies, base::Passed(&filter), callback); base::Bind(FilterCookies, base::Passed(&filter), callback);
net::CookieMonster* monster = GetCookieStore(getter)->GetCookieMonster();
// Empty url will match all url cookies. // Empty url will match all url cookies.
if (url.empty()) if (url.empty())
monster->GetAllCookiesAsync(filtered_callback); GetCookieStore(getter)->GetAllCookiesAsync(filtered_callback);
else else
monster->GetAllCookiesForURLAsync(GURL(url), filtered_callback); GetCookieStore(getter)->GetAllCookiesForURLAsync(GURL(url), filtered_callback);
} }
// Removes cookie with |url| and |name| in IO thread. // Removes cookie with |url| and |name| in IO thread.
@ -162,7 +161,9 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
std::string url, name, value, domain, path; std::string url, name, value, domain, path;
bool secure = false; bool secure = false;
bool http_only = false; bool http_only = false;
double creation_date;
double expiration_date; double expiration_date;
double last_access_date;
details->GetString("url", &url); details->GetString("url", &url);
details->GetString("name", &name); details->GetString("name", &name);
details->GetString("value", &value); details->GetString("value", &value);
@ -171,6 +172,13 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
details->GetBoolean("secure", &secure); details->GetBoolean("secure", &secure);
details->GetBoolean("httpOnly", &http_only); details->GetBoolean("httpOnly", &http_only);
base::Time creation_time;
if (details->GetDouble("creationDate", &creation_date)) {
creation_time = (creation_date == 0) ?
base::Time::UnixEpoch() :
base::Time::FromDoubleT(creation_date);
}
base::Time expiration_time; base::Time expiration_time;
if (details->GetDouble("expirationDate", &expiration_date)) { if (details->GetDouble("expirationDate", &expiration_date)) {
expiration_time = (expiration_date == 0) ? expiration_time = (expiration_date == 0) ?
@ -178,9 +186,17 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
base::Time::FromDoubleT(expiration_date); base::Time::FromDoubleT(expiration_date);
} }
GetCookieStore(getter)->GetCookieMonster()->SetCookieWithDetailsAsync( base::Time last_access_time;
GURL(url), name, value, domain, path, expiration_time, secure, http_only, if (details->GetDouble("lastAccessDate", &last_access_date)) {
false, false, false, net::COOKIE_PRIORITY_DEFAULT, last_access_time = (last_access_date == 0) ?
base::Time::UnixEpoch() :
base::Time::FromDoubleT(last_access_date);
}
GetCookieStore(getter)->SetCookieWithDetailsAsync(
GURL(url), name, value, domain, path, creation_time,
expiration_time, last_access_time, secure, http_only,
false, false, net::COOKIE_PRIORITY_DEFAULT,
base::Bind(OnSetCookie, callback)); base::Bind(OnSetCookie, callback));
} }