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

Modernize to C++11: Use for-range loop.

Browse source
This commit is contained in:
Haojian Wu 2016-07-10 13:32:40 +02:00
commit 55b3f1936f
17 changed files with 66 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

18
chromium_src/extensions/common/url_pattern.cc
View file

@ -118,8 +118,8 @@ std::string StripTrailingWildcard(const std::string& path) {
namespace extensions {
// static
bool URLPattern::IsValidSchemeForExtensions(const std::string& scheme) {
for (size_t i = 0; i < arraysize(kValidSchemes); ++i) {
if (scheme == kValidSchemes[i])
for (auto& kValidScheme : kValidSchemes) {
if (scheme == kValidScheme)
return true;
}
return false;
@ -543,8 +543,8 @@ bool URLPattern::Contains(const URLPattern& other) const {
bool URLPattern::MatchesAnyScheme(
const std::vector<std::string>& schemes) const {
for (auto i = schemes.begin(); i != schemes.end(); ++i) {
if (MatchesScheme(*i))
for (const auto& scheme : schemes) {
if (MatchesScheme(scheme))
return true;
}
@ -553,8 +553,8 @@ bool URLPattern::MatchesAnyScheme(
bool URLPattern::MatchesAllSchemes(
const std::vector<std::string>& schemes) const {
for (auto i = schemes.begin(); i != schemes.end(); ++i) {
if (!MatchesScheme(*i))
for (const auto& scheme : schemes) {
if (!MatchesScheme(scheme))
return false;
}
@ -584,9 +584,9 @@ std::vector<std::string> URLPattern::GetExplicitSchemes() const {
return result;
}
for (size_t i = 0; i < arraysize(kValidSchemes); ++i) {
if (MatchesScheme(kValidSchemes[i])) {
result.push_back(kValidSchemes[i]);
for (auto& kValidScheme : kValidSchemes) {
if (MatchesScheme(kValidScheme)) {
result.push_back(kValidScheme);
}
}