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

Remove AtomBrowserContext::SetCookieableSchemes

Browse source 
The standard schemes are already stored, we don't have to duplicate the
list for every session.
This commit is contained in:
Cheng Zhao 2016-08-05 16:35:37 +09:00
parent 6cd1aa21af
commit a14b2c1cf8
4 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

31
atom/browser/api/atom_api_protocol.cc
View file

@ -42,10 +42,26 @@ void ClearJobFactoryInIO(
} // namespace
std::vector<std::string> GetStandardSchemes() {
return g_standard_schemes;
}
void RegisterStandardSchemes(const std::vector<std::string>& schemes) {
g_standard_schemes = schemes;
auto* policy = content::ChildProcessSecurityPolicy::GetInstance();
for (const std::string& scheme : schemes) {
url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
policy->RegisterWebSafeScheme(scheme);
}
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
atom::switches::kStandardSchemes, base::JoinString(schemes, ","));
}
Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
: request_context_getter_(browser_context->GetRequestContext()),
weak_factory_(this) {
browser_context->SetCookieableSchemes(g_standard_schemes);
Init(isolate);
}
@ -204,17 +220,7 @@ void RegisterStandardSchemes(
return;
}
auto policy = content::ChildProcessSecurityPolicy::GetInstance();
for (const auto& scheme : schemes) {
url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
policy->RegisterWebSafeScheme(scheme);
}
auto command_line = base::CommandLine::ForCurrentProcess();
command_line->AppendSwitchASCII(atom::switches::kStandardSchemes,
base::JoinString(schemes, ","));
atom::api::g_standard_schemes = schemes;
atom::api::RegisterStandardSchemes(schemes);
}
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
@ -222,6 +228,7 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
v8::Isolate* isolate = context->GetIsolate();
mate::Dictionary dict(isolate, exports);
dict.SetMethod("registerStandardSchemes", &RegisterStandardSchemes);
dict.SetMethod("getStandardSchemes", &atom::api::GetStandardSchemes);
}
} // namespace