Commit f1bc6b11 authored by Gyuyoung Kim's avatar Gyuyoung Kim Committed by Commit Bot

Use mojom::ManifestShareTarget_Enctype instead of Manifest::ShareTarget::Enctype

This CL replaces all uses of blink::Manifest::ShareTarget::Enctype
with blink::mojom::ManifestShareTarget_Enctype in order to reduce type
conversion between them.

Bug: 919392
Change-Id: Ifc173da74d8679f00cf4bb39e4c05ef5b1103fdd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2522832
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825334}
parent 92eb8807
...@@ -40,7 +40,7 @@ struct ShareTargetParams { ...@@ -40,7 +40,7 @@ struct ShareTargetParams {
struct ShareTarget { struct ShareTarget {
GURL action; GURL action;
blink::mojom::ManifestShareTarget_Method method; blink::mojom::ManifestShareTarget_Method method;
blink::Manifest::ShareTarget::Enctype enctype; blink::mojom::ManifestShareTarget_Enctype enctype;
ShareTargetParams params; ShareTargetParams params;
ShareTarget(); ShareTarget();
~ShareTarget(); ~ShareTarget();
......
...@@ -217,7 +217,7 @@ std::unique_ptr<std::string> BuildProtoInBackground( ...@@ -217,7 +217,7 @@ std::unique_ptr<std::string> BuildProtoInBackground(
share_target->set_method("GET"); share_target->set_method("GET");
} }
if (shortcut_info.share_target->enctype == if (shortcut_info.share_target->enctype ==
blink::Manifest::ShareTarget::Enctype::kMultipartFormData) { blink::mojom::ManifestShareTarget_Enctype::kMultipartFormData) {
share_target->set_enctype("multipart/form-data"); share_target->set_enctype("multipart/form-data");
} else { } else {
share_target->set_enctype("application/x-www-form-urlencoded"); share_target->set_enctype("application/x-www-form-urlencoded");
......
...@@ -238,7 +238,7 @@ void WebApkUpdateDataFetcher::OnGotIconMurmur2Hashes( ...@@ -238,7 +238,7 @@ void WebApkUpdateDataFetcher::OnGotIconMurmur2Hashes(
blink::mojom::ManifestShareTarget_Method::kPost); blink::mojom::ManifestShareTarget_Method::kPost);
java_share_params_is_enctype_multipart = java_share_params_is_enctype_multipart =
(info_.share_target->enctype == (info_.share_target->enctype ==
blink::Manifest::ShareTarget::Enctype::kMultipartFormData); blink::mojom::ManifestShareTarget_Enctype::kMultipartFormData);
std::vector<base::string16> file_names; std::vector<base::string16> file_names;
std::vector<std::vector<base::string16>> accepts; std::vector<std::vector<base::string16>> accepts;
......
...@@ -118,8 +118,8 @@ static void JNI_WebApkUpdateManager_StoreWebApkUpdateRequestToFile( ...@@ -118,8 +118,8 @@ static void JNI_WebApkUpdateManager_StoreWebApkUpdateRequestToFile(
info.share_target->enctype = info.share_target->enctype =
java_share_target_param_is_enctype_multipart == JNI_TRUE java_share_target_param_is_enctype_multipart == JNI_TRUE
? blink::Manifest::ShareTarget::Enctype::kMultipartFormData ? blink::mojom::ManifestShareTarget_Enctype::kMultipartFormData
: blink::Manifest::ShareTarget::Enctype::kFormUrlEncoded; : blink::mojom::ManifestShareTarget_Enctype::kFormUrlEncoded;
std::vector<base::string16> fileNames; std::vector<base::string16> fileNames;
base::android::AppendJavaStringArrayToStringVector( base::android::AppendJavaStringArrayToStringVector(
......
...@@ -139,11 +139,11 @@ apps::ShareTarget::Method ToAppsShareTargetMethod( ...@@ -139,11 +139,11 @@ apps::ShareTarget::Method ToAppsShareTargetMethod(
} }
apps::ShareTarget::Enctype ToAppsShareTargetEnctype( apps::ShareTarget::Enctype ToAppsShareTargetEnctype(
blink::Manifest::ShareTarget::Enctype enctype) { blink::mojom::ManifestShareTarget_Enctype enctype) {
switch (enctype) { switch (enctype) {
case blink::Manifest::ShareTarget::Enctype::kFormUrlEncoded: case blink::mojom::ManifestShareTarget_Enctype::kFormUrlEncoded:
return apps::ShareTarget::Enctype::kFormUrlEncoded; return apps::ShareTarget::Enctype::kFormUrlEncoded;
case blink::Manifest::ShareTarget::Enctype::kMultipartFormData: case blink::mojom::ManifestShareTarget_Enctype::kMultipartFormData:
return apps::ShareTarget::Enctype::kMultipartFormData; return apps::ShareTarget::Enctype::kMultipartFormData;
} }
NOTREACHED(); NOTREACHED();
......
...@@ -212,7 +212,7 @@ TEST(WebAppInstallUtils, UpdateWebAppInfoFromManifest_ShareTarget) { ...@@ -212,7 +212,7 @@ TEST(WebAppInstallUtils, UpdateWebAppInfoFromManifest_ShareTarget) {
share_target.action = GURL("http://example.com/share1"); share_target.action = GURL("http://example.com/share1");
share_target.method = blink::mojom::ManifestShareTarget_Method::kPost; share_target.method = blink::mojom::ManifestShareTarget_Method::kPost;
share_target.enctype = share_target.enctype =
blink::Manifest::ShareTarget::Enctype::kMultipartFormData; blink::mojom::ManifestShareTarget_Enctype::kMultipartFormData;
share_target.params.title = base::ASCIIToUTF16("kTitle"); share_target.params.title = base::ASCIIToUTF16("kTitle");
share_target.params.text = base::ASCIIToUTF16("kText"); share_target.params.text = base::ASCIIToUTF16("kText");
...@@ -249,7 +249,7 @@ TEST(WebAppInstallUtils, UpdateWebAppInfoFromManifest_ShareTarget) { ...@@ -249,7 +249,7 @@ TEST(WebAppInstallUtils, UpdateWebAppInfoFromManifest_ShareTarget) {
share_target.action = GURL("http://example.com/share2"); share_target.action = GURL("http://example.com/share2");
share_target.method = blink::mojom::ManifestShareTarget_Method::kGet; share_target.method = blink::mojom::ManifestShareTarget_Method::kGet;
share_target.enctype = share_target.enctype =
blink::Manifest::ShareTarget::Enctype::kFormUrlEncoded; blink::mojom::ManifestShareTarget_Enctype::kFormUrlEncoded;
share_target.params.text = base::ASCIIToUTF16("kText"); share_target.params.text = base::ASCIIToUTF16("kText");
share_target.params.url = base::ASCIIToUTF16("kUrl"); share_target.params.url = base::ASCIIToUTF16("kUrl");
......
...@@ -86,11 +86,6 @@ struct BLINK_COMMON_EXPORT Manifest { ...@@ -86,11 +86,6 @@ struct BLINK_COMMON_EXPORT Manifest {
// Structure representing how a Web Share target handles an incoming share. // Structure representing how a Web Share target handles an incoming share.
struct BLINK_COMMON_EXPORT ShareTarget { struct BLINK_COMMON_EXPORT ShareTarget {
enum class Enctype {
kFormUrlEncoded,
kMultipartFormData,
};
ShareTarget(); ShareTarget();
~ShareTarget(); ~ShareTarget();
...@@ -102,7 +97,7 @@ struct BLINK_COMMON_EXPORT Manifest { ...@@ -102,7 +97,7 @@ struct BLINK_COMMON_EXPORT Manifest {
blink::mojom::ManifestShareTarget_Method method; blink::mojom::ManifestShareTarget_Method method;
// The way that share data is encoded in "POST" request. // The way that share data is encoded in "POST" request.
Enctype enctype; blink::mojom::ManifestShareTarget_Enctype enctype;
ShareTargetParams params; ShareTargetParams params;
}; };
......
...@@ -294,7 +294,7 @@ struct BLINK_COMMON_EXPORT ...@@ -294,7 +294,7 @@ struct BLINK_COMMON_EXPORT
const ::blink::Manifest::ShareTarget& share_target) { const ::blink::Manifest::ShareTarget& share_target) {
return share_target.method; return share_target.method;
} }
static ::blink::Manifest::ShareTarget::Enctype enctype( static ::blink::mojom::ManifestShareTarget_Enctype enctype(
const ::blink::Manifest::ShareTarget& share_target) { const ::blink::Manifest::ShareTarget& share_target) {
return share_target.enctype; return share_target.enctype;
} }
...@@ -343,35 +343,6 @@ struct BLINK_COMMON_EXPORT ...@@ -343,35 +343,6 @@ struct BLINK_COMMON_EXPORT
::blink::Manifest::ProtocolHandler* out); ::blink::Manifest::ProtocolHandler* out);
}; };
template <>
struct BLINK_COMMON_EXPORT EnumTraits<blink::mojom::ManifestShareTarget_Enctype,
::blink::Manifest::ShareTarget::Enctype> {
static blink::mojom::ManifestShareTarget_Enctype ToMojom(
::blink::Manifest::ShareTarget::Enctype enctype) {
switch (enctype) {
case ::blink::Manifest::ShareTarget::Enctype::kFormUrlEncoded:
return blink::mojom::ManifestShareTarget_Enctype::kFormUrlEncoded;
case ::blink::Manifest::ShareTarget::Enctype::kMultipartFormData:
return blink::mojom::ManifestShareTarget_Enctype::kMultipartFormData;
}
NOTREACHED();
return blink::mojom::ManifestShareTarget_Enctype::kFormUrlEncoded;
}
static bool FromMojom(blink::mojom::ManifestShareTarget_Enctype input,
::blink::Manifest::ShareTarget::Enctype* out) {
switch (input) {
case blink::mojom::ManifestShareTarget_Enctype::kFormUrlEncoded:
*out = ::blink::Manifest::ShareTarget::Enctype::kFormUrlEncoded;
return true;
case blink::mojom::ManifestShareTarget_Enctype::kMultipartFormData:
*out = ::blink::Manifest::ShareTarget::Enctype::kMultipartFormData;
return true;
}
return false;
}
};
} // namespace mojo } // namespace mojo
#endif // THIRD_PARTY_BLINK_PUBLIC_COMMON_MANIFEST_MANIFEST_MOJOM_TRAITS_H_ #endif // THIRD_PARTY_BLINK_PUBLIC_COMMON_MANIFEST_MANIFEST_MOJOM_TRAITS_H_
...@@ -145,14 +145,7 @@ TypeConverter<blink::Manifest::ShareTarget, ...@@ -145,14 +145,7 @@ TypeConverter<blink::Manifest::ShareTarget,
output.action = input->action; output.action = input->action;
output.method = input->method; output.method = input->method;
output.enctype = input->enctype;
::blink::Manifest::ShareTarget::Enctype output_enctype;
if (!EnumTraits<blink::mojom::ManifestShareTarget_Enctype,
::blink::Manifest::ShareTarget::Enctype>::
FromMojom(input->enctype, &output_enctype)) {
NOTREACHED();
}
output.enctype = output_enctype;
output.params = input->params.To<::blink::Manifest::ShareTargetParams>(); output.params = input->params.To<::blink::Manifest::ShareTargetParams>();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment