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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/base/capabilities.h" 5 #include "remoting/base/capabilities.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 18 matching lines...) Expand all
29 29
30 std::vector<std::string> host_caps = base::SplitString( 30 std::vector<std::string> host_caps = base::SplitString(
31 host_capabilities, " ", base::KEEP_WHITESPACE, 31 host_capabilities, " ", base::KEEP_WHITESPACE,
32 base::SPLIT_WANT_NONEMPTY); 32 base::SPLIT_WANT_NONEMPTY);
33 std::sort(host_caps.begin(), host_caps.end()); 33 std::sort(host_caps.begin(), host_caps.end());
34 34
35 std::vector<std::string> result = 35 std::vector<std::string> result =
36 base::STLSetIntersection<std::vector<std::string> >( 36 base::STLSetIntersection<std::vector<std::string> >(
37 client_caps, host_caps); 37 client_caps, host_caps);
38 38
39 return JoinString(result, " "); 39 return base::JoinString(result, " ");
40 } 40 }
41 41
42 } // namespace remoting 42 } // namespace remoting
OLDNEW
« 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