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

Unified Diff: remoting/base/capabilities.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 | « net/websockets/websocket_basic_handshake_stream.cc ('k') | remoting/base/capabilities_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/capabilities.cc
diff --git a/remoting/base/capabilities.cc b/remoting/base/capabilities.cc
index 122649298208b7fc88f1883d38a9ffe3ced3caac..4903aedfe5fab84b1cb3086500d6bf2dc67f738e 100644
--- a/remoting/base/capabilities.cc
+++ b/remoting/base/capabilities.cc
@@ -36,7 +36,7 @@ std::string IntersectCapabilities(const std::string& client_capabilities,
base::STLSetIntersection<std::vector<std::string> >(
client_caps, host_caps);
- return JoinString(result, " ");
+ return base::JoinString(result, " ");
}
} // namespace remoting
« no previous file with comments | « net/websockets/websocket_basic_handshake_stream.cc ('k') | remoting/base/capabilities_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698