| 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 #ifndef MOJO_SERVICES_CATALOG_ENTRY_H_ | 5 #ifndef SERVICES_CATALOG_ENTRY_H_ |
| 6 #define MOJO_SERVICES_CATALOG_ENTRY_H_ | 6 #define SERVICES_CATALOG_ENTRY_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "services/shell/public/cpp/capabilities.h" | 13 #include "services/shell/public/cpp/capabilities.h" |
| 14 | 14 |
| 15 namespace base { | 15 namespace base { |
| 16 class DictionaryValue; | 16 class DictionaryValue; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 | 66 |
| 67 } // namespace catalog | 67 } // namespace catalog |
| 68 | 68 |
| 69 namespace mojo { | 69 namespace mojo { |
| 70 template <> | 70 template <> |
| 71 struct TypeConverter<shell::mojom::ResolveResultPtr, catalog::Entry> { | 71 struct TypeConverter<shell::mojom::ResolveResultPtr, catalog::Entry> { |
| 72 static shell::mojom::ResolveResultPtr Convert(const catalog::Entry& input); | 72 static shell::mojom::ResolveResultPtr Convert(const catalog::Entry& input); |
| 73 }; | 73 }; |
| 74 } | 74 } |
| 75 | 75 |
| 76 #endif // MOJO_SERVICES_CATALOG_ENTRY_H_ | 76 #endif // SERVICES_CATALOG_ENTRY_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1878893002:
Move //mojo/services tracing & catalog to //services (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@63move