Index: third_party/WebKit/Source/platform/inspector_protocol/Exported_h.template |
diff --git a/third_party/WebKit/Source/platform/inspector_protocol/Exported_h.template b/third_party/WebKit/Source/platform/inspector_protocol/Exported_h.template |
index 66cf7f9018537abbb4e6a8dc299a1f0197163a3a..d73205ddb5ebbc3e2e3abdb4e550f54c39d2db17 100644 |
--- a/third_party/WebKit/Source/platform/inspector_protocol/Exported_h.template |
+++ b/third_party/WebKit/Source/platform/inspector_protocol/Exported_h.template |
@@ -4,14 +4,15 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef protocol_{{domain.domain}}_api_h |
-#define protocol_{{domain.domain}}_api_h |
+#ifndef {{"_".join(config.protocol.namespace)}}_{{domain.domain}}_api_h |
+#define {{"_".join(config.protocol.namespace)}}_{{domain.domain}}_api_h |
#include "{{config.class_export.header}}" |
-#include "{{config.lib_package}}/InspectorProtocol.h" |
+#include "{{config.protocol.package}}/InspectorProtocol.h" |
-namespace blink { |
-namespace protocol { |
+{% for namespace in config.protocol.namespace %} |
+namespace {{namespace}} { |
+{% endfor %} |
namespace {{domain.domain}} { |
namespace API { |
@@ -47,15 +48,16 @@ namespace {{param.name | to_title_case}}Enum { |
class {{config.class_export.macro}} {{type.id}} { |
public: |
- virtual String16 toJSONString() const = 0; |
+ virtual String toJSONString() const = 0; |
virtual ~{{type.id}}() { } |
- static std::unique_ptr<protocol::{{domain.domain}}::API::{{type.id}}> fromJSONString(const String16& json); |
+ static std::unique_ptr<protocol::{{domain.domain}}::API::{{type.id}}> fromJSONString(const String& json); |
}; |
{% endfor %} |
} // namespace API |
} // namespace {{domain.domain}} |
-} // namespace protocol |
-} // namespace blink |
+{% for namespace in config.protocol.namespace %} |
+} // namespace {{namespace}} |
+{% endfor %} |
-#endif // !defined(protocol_{{domain.domain}}_api_h) |
+#endif // !defined({{"_".join(config.protocol.namespace)}}_{{domain.domain}}_api_h) |