| Index: content/public/common/common_param_traits.h
|
| diff --git a/content/public/common/common_param_traits.h b/content/public/common/common_param_traits.h
|
| index 18a0ee088acdc0b6b3311867781c70885a9199e7..8800fe12194e972058a0922b8be083cb0f199de3 100644
|
| --- a/content/public/common/common_param_traits.h
|
| +++ b/content/public/common/common_param_traits.h
|
| @@ -14,6 +14,8 @@
|
| #ifndef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_H_
|
| #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_H_
|
|
|
| +#include <string>
|
| +
|
| #include "base/memory/ref_counted.h"
|
| #include "content/common/content_export.h"
|
| #include "content/public/common/common_param_traits_macros.h"
|
| @@ -21,6 +23,7 @@
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/surface/transport_dib.h"
|
| #include "url/gurl.h"
|
| +#include "url/origin.h"
|
|
|
| class SkBitmap;
|
|
|
| @@ -51,6 +54,14 @@ struct CONTENT_EXPORT ParamTraits<GURL> {
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| +template <>
|
| +struct CONTENT_EXPORT ParamTraits<url::Origin> {
|
| + typedef url::Origin param_type;
|
| + static void Write(Message* m, const param_type& p);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* p);
|
| + static void Log(const param_type& p, std::string* l);
|
| +};
|
| +
|
| template<>
|
| struct CONTENT_EXPORT ParamTraits<net::HostPortPair> {
|
| typedef net::HostPortPair param_type;
|
|
|