diff --git a/atom/app/atom_content_client.cc b/atom/app/atom_content_client.cc index 30508a267d66..a49b39e45cf3 100644 --- a/atom/app/atom_content_client.cc +++ b/atom/app/atom_content_client.cc @@ -207,8 +207,7 @@ void AtomContentClient::AddSecureSchemesAndOrigins( std::set* secure_schemes, std::set* secure_origins) { std::vector schemes; - ConvertStringWithSeparatorToVector(&schemes, ",", - switches::kSecureSchemes); + ConvertStringWithSeparatorToVector(&schemes, ",", switches::kSecureSchemes); for (const std::string& scheme : schemes) secure_schemes->insert(scheme); } diff --git a/atom/browser/api/atom_api_protocol.cc b/atom/browser/api/atom_api_protocol.cc index ee2fe9d598ac..e3b15ed43293 100644 --- a/atom/browser/api/atom_api_protocol.cc +++ b/atom/browser/api/atom_api_protocol.cc @@ -46,7 +46,8 @@ std::vector GetStandardSchemes() { return g_standard_schemes; } -void RegisterStandardSchemes(const std::vector& schemes, mate::Arguments* args) { +void RegisterStandardSchemes(const std::vector& schemes, + mate::Arguments* args) { g_standard_schemes = schemes; auto* policy = content::ChildProcessSecurityPolicy::GetInstance(); diff --git a/atom/browser/api/atom_api_protocol.h b/atom/browser/api/atom_api_protocol.h index bfbf998546f1..dfc32be6bc57 100644 --- a/atom/browser/api/atom_api_protocol.h +++ b/atom/browser/api/atom_api_protocol.h @@ -29,7 +29,8 @@ namespace atom { namespace api { std::vector GetStandardSchemes(); -void RegisterStandardSchemes(const std::vector& schemes, mate::Arguments* args); +void RegisterStandardSchemes(const std::vector& schemes, + mate::Arguments* args); class Protocol : public mate::TrackableObject { public: diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc index 1c873d93ee11..5f2aec74e353 100644 --- a/atom/renderer/atom_renderer_client.cc +++ b/atom/renderer/atom_renderer_client.cc @@ -124,7 +124,8 @@ bool IsDevToolsExtension(content::RenderFrame* render_frame) { std::vector ParseSchemesCLISwitch(const char* switch_name) { base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); std::string custom_schemes = command_line->GetSwitchValueASCII(switch_name); - return base::SplitString(custom_schemes, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); + return base::SplitString( + custom_schemes, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); } } // namespace @@ -133,10 +134,10 @@ AtomRendererClient::AtomRendererClient() : node_bindings_(NodeBindings::Create(false)), atom_bindings_(new AtomBindings) { // Parse --standard-schemes=scheme1,scheme2 - std::vector standard_schemes_list = ParseSchemesCLISwitch(switches::kStandardSchemes); - for (const std::string& scheme : standard_schemes_list) { + std::vector standard_schemes_list = + ParseSchemesCLISwitch(switches::kStandardSchemes); + for (const std::string& scheme : standard_schemes_list) url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT); - } } AtomRendererClient::~AtomRendererClient() { @@ -185,10 +186,11 @@ void AtomRendererClient::RenderFrameCreated( blink::WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers("file"); // Parse --secure-schemes=scheme1,scheme2 - std::vector secure_schemes_list = ParseSchemesCLISwitch(switches::kSecureSchemes); - for (const std::string& secure_scheme : secure_schemes_list) { - blink::WebSecurityPolicy::registerURLSchemeAsSecure(blink::WebString::fromUTF8(secure_scheme)); - } + std::vector secure_schemes_list = + ParseSchemesCLISwitch(switches::kSecureSchemes); + for (const std::string& secure_scheme : secure_schemes_list) + blink::WebSecurityPolicy::registerURLSchemeAsSecure( + blink::WebString::fromUTF8(secure_scheme)); } void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) {