| 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 "content/public/browser/desktop_media_id.h" | 5 #include "content/public/browser/desktop_media_id.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 } | 95 } |
| 96 | 96 |
| 97 #endif // defined(USE_AURA) | 97 #endif // defined(USE_AURA) |
| 98 | 98 |
| 99 bool DesktopMediaID::operator<(const DesktopMediaID& other) const { | 99 bool DesktopMediaID::operator<(const DesktopMediaID& other) const { |
| 100 #if defined(USE_AURA) | 100 #if defined(USE_AURA) |
| 101 return std::tie(type, id, aura_id, web_contents_id) < | 101 return std::tie(type, id, aura_id, web_contents_id) < |
| 102 std::tie(other.type, other.id, other.aura_id, other.web_contents_id); | 102 std::tie(other.type, other.id, other.aura_id, other.web_contents_id); |
| 103 #else | 103 #else |
| 104 return std::tie(type, id, web_contents_id) < | 104 return std::tie(type, id, web_contents_id) < |
| 105 std::tie(other.type, other.id, web_contents_id); | 105 std::tie(other.type, other.id, other.web_contents_id); |
| 106 #endif | 106 #endif |
| 107 } | 107 } |
| 108 | 108 |
| 109 bool DesktopMediaID::operator==(const DesktopMediaID& other) const { | 109 bool DesktopMediaID::operator==(const DesktopMediaID& other) const { |
| 110 #if defined(USE_AURA) | 110 #if defined(USE_AURA) |
| 111 return type == other.type && id == other.id && aura_id == other.aura_id && | 111 return type == other.type && id == other.id && aura_id == other.aura_id && |
| 112 web_contents_id == other.web_contents_id; | 112 web_contents_id == other.web_contents_id; |
| 113 #else | 113 #else |
| 114 return type == other.type && id == other.id && | 114 return type == other.type && id == other.id && |
| 115 web_contents_id == other.web_contents_id; | 115 web_contents_id == other.web_contents_id; |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 | 190 |
| 191 #if defined(USE_AURA) | 191 #if defined(USE_AURA) |
| 192 prefix.append(":"); | 192 prefix.append(":"); |
| 193 prefix.append(base::Int64ToString(aura_id)); | 193 prefix.append(base::Int64ToString(aura_id)); |
| 194 #endif // defined(USE_AURA) | 194 #endif // defined(USE_AURA) |
| 195 | 195 |
| 196 return prefix; | 196 return prefix; |
| 197 } | 197 } |
| 198 | 198 |
| 199 } // namespace content | 199 } // namespace content |
| OLD | NEW |