| 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 CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_ | 5 #ifndef CONTENT_BROWSER_SERVICE_MANAGER_MERGE_DICTIONARY_H_ |
| 6 #define CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_ | 6 #define CONTENT_BROWSER_SERVICE_MANAGER_MERGE_DICTIONARY_H_ |
| 7 | 7 |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "content/common/content_export.h" | 9 #include "content/common/content_export.h" |
| 10 | 10 |
| 11 namespace content { | 11 namespace content { |
| 12 | 12 |
| 13 // Similar to base::DictionaryValue::MergeDictionary(), except concatenates | 13 // Similar to base::DictionaryValue::MergeDictionary(), except concatenates |
| 14 // ListValue contents. | 14 // ListValue contents. |
| 15 // This is explicitly not part of base::DictionaryValue at brettw's request. | 15 // This is explicitly not part of base::DictionaryValue at brettw's request. |
| 16 void CONTENT_EXPORT MergeDictionary(base::DictionaryValue* target, | 16 void CONTENT_EXPORT MergeDictionary(base::DictionaryValue* target, |
| 17 const base::DictionaryValue* source); | 17 const base::DictionaryValue* source); |
| 18 | 18 |
| 19 } // namespace content | 19 } // namespace content |
| 20 | 20 |
| 21 #endif // CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_ | 21 #endif // CONTENT_BROWSER_SERVICE_MANAGER_MERGE_DICTIONARY_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2387263002:
Rename MojoShellContext -> ServiceManagerContext. (Closed)
