| 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_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_ | 5 #ifndef SERVICES_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_ |
| 6 #define MOJO_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_ | 6 #define SERVICES_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 #include "mojo/services/catalog/store.h" | 12 #include "mojo/services/catalog/store.h" |
| 13 | 13 |
| 14 namespace mojo { | 14 namespace mojo { |
| 15 namespace shell { | 15 namespace shell { |
| 16 | 16 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 36 | 36 |
| 37 // Returns a dictionary for an app with the specified name, display name and a | 37 // Returns a dictionary for an app with the specified name, display name and a |
| 38 // permissive filter. | 38 // permissive filter. |
| 39 scoped_ptr<base::DictionaryValue> BuildPermissiveSerializedAppInfo( | 39 scoped_ptr<base::DictionaryValue> BuildPermissiveSerializedAppInfo( |
| 40 const std::string& name, | 40 const std::string& name, |
| 41 const std::string& display_name); | 41 const std::string& display_name); |
| 42 | 42 |
| 43 } // namespace shell | 43 } // namespace shell |
| 44 } // namespace mojo | 44 } // namespace mojo |
| 45 | 45 |
| 46 #endif // MOJO_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_ | 46 #endif // SERVICES_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_ |
| OLD | NEW |