| OLD | NEW |
| 1 // Copyright 2014 The Crashpad Authors. All rights reserved. | 1 // Copyright 2014 The Crashpad Authors. All rights reserved. |
| 2 // | 2 // |
| 3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
| 5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
| 6 // | 6 // |
| 7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 // | 8 // |
| 9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
| 10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 data_4[1], | 93 data_4[1], |
| 94 data_5[0], | 94 data_5[0], |
| 95 data_5[1], | 95 data_5[1], |
| 96 data_5[2], | 96 data_5[2], |
| 97 data_5[3], | 97 data_5[3], |
| 98 data_5[4], | 98 data_5[4], |
| 99 data_5[5]); | 99 data_5[5]); |
| 100 } | 100 } |
| 101 | 101 |
| 102 #if defined(OS_WIN) | 102 #if defined(OS_WIN) |
| 103 std::wstring UUID::ToWideString() const { | 103 base::string16 UUID::ToString16() const { |
| 104 return base::UTF8ToUTF16(ToString()); | 104 return base::UTF8ToUTF16(ToString()); |
| 105 } | 105 } |
| 106 #endif // OS_WIN | 106 #endif // OS_WIN |
| 107 | 107 |
| 108 } // namespace crashpad | 108 } // namespace crashpad |
| OLD | NEW |