Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(769)

Unified Diff: extensions/common/features/base_feature_provider.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/common/csp_validator.cc ('k') | extensions/common/permissions/permission_message_test_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/features/base_feature_provider.cc
diff --git a/extensions/common/features/base_feature_provider.cc b/extensions/common/features/base_feature_provider.cc
index 9d24d84ad085bc7d7badd9f3a3b1ce920c69e16c..472e1f55122b89a44fb7aa0973e7c6982560aa13 100644
--- a/extensions/common/features/base_feature_provider.cc
+++ b/extensions/common/features/base_feature_provider.cc
@@ -62,7 +62,7 @@ BaseFeatureProvider::BaseFeatureProvider(const base::DictionaryValue& root,
std::stack<std::pair<std::string, const base::DictionaryValue*> >
parse_stack;
while (!split.empty()) {
- std::string parent_name = JoinString(split, '.');
+ std::string parent_name = base::JoinString(split, ".");
split.pop_back();
if (root.HasKey(parent_name)) {
const base::DictionaryValue* parent = nullptr;
@@ -176,7 +176,7 @@ Feature* BaseFeatureProvider::GetParent(Feature* feature) const {
if (split.size() < 2)
return nullptr;
split.pop_back();
- return GetFeature(JoinString(split, '.'));
+ return GetFeature(base::JoinString(split, "."));
}
// Children of a given API are named starting with parent.name()+".", which
« no previous file with comments | « extensions/common/csp_validator.cc ('k') | extensions/common/permissions/permission_message_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698