| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "mojo/shell/public/cpp/identity.h" | 5 #include "services/shell/public/cpp/identity.h" |
| 6 | 6 |
| 7 #include "base/guid.h" | 7 #include "base/guid.h" |
| 8 #include "mojo/shell/public/cpp/names.h" | 8 #include "services/shell/public/cpp/names.h" |
| 9 | 9 |
| 10 namespace mojo { | 10 namespace mojo { |
| 11 | 11 |
| 12 Identity::Identity() {} | 12 Identity::Identity() {} |
| 13 | 13 |
| 14 Identity::Identity(const std::string& name, const std::string& user_id) | 14 Identity::Identity(const std::string& name, const std::string& user_id) |
| 15 : Identity(name, user_id, "") {} | 15 : Identity(name, user_id, "") {} |
| 16 | 16 |
| 17 Identity::Identity(const std::string& name, const std::string& user_id, | 17 Identity::Identity(const std::string& name, const std::string& user_id, |
| 18 const std::string& instance) | 18 const std::string& instance) |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 return identity; | 51 return identity; |
| 52 } | 52 } |
| 53 | 53 |
| 54 // static | 54 // static |
| 55 Identity TypeConverter<Identity, shell::mojom::IdentityPtr>::Convert( | 55 Identity TypeConverter<Identity, shell::mojom::IdentityPtr>::Convert( |
| 56 const shell::mojom::IdentityPtr& input) { | 56 const shell::mojom::IdentityPtr& input) { |
| 57 return Identity(input->name, input->user_id, input->instance); | 57 return Identity(input->name, input->user_id, input->instance); |
| 58 } | 58 } |
| 59 | 59 |
| 60 } // namespace mojo | 60 } // namespace mojo |
| OLD | NEW |