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

Remove linter errors

Browse source
This commit is contained in:
Kevin Sawicki 2016-12-12 12:45:57 -08:00
parent 381f55b3cb
commit cac85d2a12
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/app/atom_content_client.cc
View file

@ -207,8 +207,7 @@ void AtomContentClient::AddSecureSchemesAndOrigins(
std::set<std::string>* secure_schemes, std::set<std::string>* secure_schemes,
std::set<GURL>* secure_origins) { std::set<GURL>* secure_origins) {
std::vector<std::string> schemes; std::vector<std::string> schemes;
ConvertStringWithSeparatorToVector(&schemes, ",", ConvertStringWithSeparatorToVector(&schemes, ",", switches::kSecureSchemes);
switches::kSecureSchemes);
for (const std::string& scheme : schemes) for (const std::string& scheme : schemes)
secure_schemes->insert(scheme); secure_schemes->insert(scheme);
} }

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

@ -46,7 +46,8 @@ std::vector<std::string> GetStandardSchemes() {
return g_standard_schemes; return g_standard_schemes;
} }
void RegisterStandardSchemes(const std::vector<std::string>& schemes, mate::Arguments* args) { void RegisterStandardSchemes(const std::vector<std::string>& schemes,
mate::Arguments* args) {
g_standard_schemes = schemes; g_standard_schemes = schemes;
auto* policy = content::ChildProcessSecurityPolicy::GetInstance(); auto* policy = content::ChildProcessSecurityPolicy::GetInstance();

3
atom/browser/api/atom_api_protocol.h
View file

@ -29,7 +29,8 @@ namespace atom {
namespace api { namespace api {
std::vector<std::string> GetStandardSchemes(); std::vector<std::string> GetStandardSchemes();
void RegisterStandardSchemes(const std::vector<std::string>& schemes, mate::Arguments* args); void RegisterStandardSchemes(const std::vector<std::string>& schemes,
mate::Arguments* args);
class Protocol : public mate::TrackableObject<Protocol> { class Protocol : public mate::TrackableObject<Protocol> {
public: public:

18
atom/renderer/atom_renderer_client.cc
View file

@ -124,7 +124,8 @@ bool IsDevToolsExtension(content::RenderFrame* render_frame) {
std::vector<std::string> ParseSchemesCLISwitch(const char* switch_name) { std::vector<std::string> ParseSchemesCLISwitch(const char* switch_name) {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
std::string custom_schemes = command_line->GetSwitchValueASCII(switch_name); 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 } // namespace
@ -133,10 +134,10 @@ AtomRendererClient::AtomRendererClient()
: node_bindings_(NodeBindings::Create(false)), : node_bindings_(NodeBindings::Create(false)),
atom_bindings_(new AtomBindings) { atom_bindings_(new AtomBindings) {
// Parse --standard-schemes=scheme1,scheme2 // Parse --standard-schemes=scheme1,scheme2
std::vector<std::string> standard_schemes_list = ParseSchemesCLISwitch(switches::kStandardSchemes); std::vector<std::string> standard_schemes_list =
for (const std::string& scheme : standard_schemes_list) { ParseSchemesCLISwitch(switches::kStandardSchemes);
for (const std::string& scheme : standard_schemes_list)
url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT); url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
}
} }
AtomRendererClient::~AtomRendererClient() { AtomRendererClient::~AtomRendererClient() {
@ -185,10 +186,11 @@ void AtomRendererClient::RenderFrameCreated(
blink::WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers("file"); blink::WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers("file");
// Parse --secure-schemes=scheme1,scheme2 // Parse --secure-schemes=scheme1,scheme2
std::vector<std::string> secure_schemes_list = ParseSchemesCLISwitch(switches::kSecureSchemes); std::vector<std::string> secure_schemes_list =
for (const std::string& secure_scheme : secure_schemes_list) { ParseSchemesCLISwitch(switches::kSecureSchemes);
blink::WebSecurityPolicy::registerURLSchemeAsSecure(blink::WebString::fromUTF8(secure_scheme)); for (const std::string& secure_scheme : secure_schemes_list)
} blink::WebSecurityPolicy::registerURLSchemeAsSecure(
blink::WebString::fromUTF8(secure_scheme));
} }
void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) { void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) {