| OLD | NEW |
| 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" |
| 11 #include "base/strings/string_piece.h" |
| 11 #include "base/strings/string_split.h" | 12 #include "base/strings/string_split.h" |
| 12 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 13 | 14 |
| 14 namespace remoting { | 15 namespace remoting { |
| 15 | 16 |
| 16 bool HasCapability(const std::string& capabilities, const std::string& key) { | 17 bool HasCapability(const std::string& capabilities, const std::string& key) { |
| 17 std::vector<base::StringPiece> caps = base::SplitStringPiece( | 18 std::vector<base::StringPiece> caps = base::SplitStringPiece( |
| 18 capabilities, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); | 19 capabilities, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); |
| 19 return std::find(caps.begin(), caps.end(), base::StringPiece(key)) != | 20 return std::find(caps.begin(), caps.end(), base::StringPiece(key)) != |
| 20 caps.end(); | 21 caps.end(); |
| 21 } | 22 } |
| 22 | 23 |
| 23 std::string IntersectCapabilities(const std::string& client_capabilities, | 24 std::string IntersectCapabilities(const std::string& client_capabilities, |
| 24 const std::string& host_capabilities) { | 25 const std::string& host_capabilities) { |
| 25 std::vector<std::string> client_caps = base::SplitString( | 26 std::vector<base::StringPiece> client_caps = |
| 26 client_capabilities, " ", base::KEEP_WHITESPACE, | 27 base::SplitStringPiece(client_capabilities, " ", base::KEEP_WHITESPACE, |
| 27 base::SPLIT_WANT_NONEMPTY); | 28 base::SPLIT_WANT_NONEMPTY); |
| 28 std::sort(client_caps.begin(), client_caps.end()); | 29 std::sort(client_caps.begin(), client_caps.end()); |
| 29 | 30 |
| 30 std::vector<std::string> host_caps = base::SplitString( | 31 std::vector<base::StringPiece> host_caps = base::SplitStringPiece( |
| 31 host_capabilities, " ", base::KEEP_WHITESPACE, | 32 host_capabilities, " ", base::KEEP_WHITESPACE, 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<base::StringPiece> result = |
| 36 base::STLSetIntersection<std::vector<std::string> >( | 36 base::STLSetIntersection<std::vector<base::StringPiece>>(client_caps, |
| 37 client_caps, host_caps); | 37 host_caps); |
| 38 | 38 |
| 39 return base::JoinString(result, " "); | 39 return base::JoinString(result, " "); |
| 40 } | 40 } |
| 41 | 41 |
| 42 } // namespace remoting | 42 } // namespace remoting |
| OLD | NEW |