Commit 573ba3d1 authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

OnionSoup: Move web_client_hints_types.mojom in public/platform to public/mojom

This CL moves web_client_hints_types.mojom in public/platform to
public/mojom/web_client_hints and updates paths for
web_client_hints_types.mojom.

Bug: 919393
Change-Id: I1f820c17bab97ff8a6e9cc4a4b5b2f9edeea6871
Reviewed-on: https://chromium-review.googlesource.com/c/1493628Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Reviewed-by: default avatarDavid Roger <droger@chromium.org>
Commit-Queue: Julie Jeongeun Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#636768}
parent 92b20e5d
...@@ -796,7 +796,7 @@ mojom("client_hints_mojom") { ...@@ -796,7 +796,7 @@ mojom("client_hints_mojom") {
public_deps = [ public_deps = [
"//mojo/public/mojom/base", "//mojo/public/mojom/base",
"//third_party/blink/public:web_client_hints_types_mojo_bindings", "//third_party/blink/public/mojom:web_client_hints_types_mojo_bindings",
"//url/mojom:url_mojom_origin", "//url/mojom:url_mojom_origin",
] ]
} }
......
...@@ -55,7 +55,6 @@ include_rules = [ ...@@ -55,7 +55,6 @@ include_rules = [
"+sandbox/linux/services/credentials.h", "+sandbox/linux/services/credentials.h",
"+services/network/public/cpp", "+services/network/public/cpp",
"+third_party/blink/public/mojom", "+third_party/blink/public/mojom",
"+third_party/blink/public/platform/web_client_hints_types.mojom.h",
"+third_party/boringssl/src/include", "+third_party/boringssl/src/include",
"+third_party/metrics_proto", # For heap profiler test. "+third_party/metrics_proto", # For heap profiler test.
"+third_party/widevine/cdm/buildflags.h", "+third_party/widevine/cdm/buildflags.h",
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
module client_hints.mojom; module client_hints.mojom;
import "mojo/public/mojom/base/time.mojom"; import "mojo/public/mojom/base/time.mojom";
import "third_party/blink/public/platform/web_client_hints_types.mojom"; import "third_party/blink/public/mojom/web_client_hints/web_client_hints_types.mojom";
import "url/mojom/origin.mojom"; import "url/mojom/origin.mojom";
// Sent from renderer to browser process when the lifetime of the client hints // Sent from renderer to browser process when the lifetime of the client hints
...@@ -16,4 +16,4 @@ interface ClientHints { ...@@ -16,4 +16,4 @@ interface ClientHints {
PersistClientHints(url.mojom.Origin primary_origin, PersistClientHints(url.mojom.Origin primary_origin,
array<blink.mojom.WebClientHintsType> client_hints, array<blink.mojom.WebClientHintsType> client_hints,
mojo_base.mojom.TimeDelta expiration_duration); mojo_base.mojom.TimeDelta expiration_duration);
}; };
\ No newline at end of file
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include "ipc/ipc_sender.h" #include "ipc/ipc_sender.h"
#include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h" #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
#include "mojo/public/cpp/system/message_pipe.h" #include "mojo/public/cpp/system/message_pipe.h"
#include "third_party/blink/public/mojom/web_client_hints/web_client_hints_types.mojom.h"
#include "third_party/blink/public/mojom/web_feature/web_feature.mojom.h" #include "third_party/blink/public/mojom/web_feature/web_feature.mojom.h"
#include "third_party/blink/public/platform/web_client_hints_types.mojom.h"
#include "third_party/blink/public/platform/web_loading_behavior_flag.h" #include "third_party/blink/public/platform/web_loading_behavior_flag.h"
#include "third_party/blink/public/platform/web_vector.h" #include "third_party/blink/public/platform/web_vector.h"
#include "third_party/blink/public/web/web_meaningful_layout.h" #include "third_party/blink/public/web/web_meaningful_layout.h"
......
...@@ -398,7 +398,8 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) { ...@@ -398,7 +398,8 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) {
// Client hints are device specific, and not origin specific. As such all // Client hints are device specific, and not origin specific. As such all
// client hint headers are considered as safe. // client hint headers are considered as safe.
// See third_party/WebKit/public/platform/web_client_hints_types.mojom. // See
// third_party/blink/public/mojom/web_client_hints/web_client_hints_types.mojom.
// Client hint headers can be added by Chrome automatically or via JavaScript. // Client hint headers can be added by Chrome automatically or via JavaScript.
if (lower_name == "device-memory" || lower_name == "dpr") if (lower_name == "device-memory" || lower_name == "dpr")
return IsSimilarToDoubleABNF(value); return IsSimilarToDoubleABNF(value);
......
...@@ -666,7 +666,6 @@ mojom("mojo_bindings") { ...@@ -666,7 +666,6 @@ mojom("mojo_bindings") {
public_deps = [ public_deps = [
":android_mojo_bindings", ":android_mojo_bindings",
":authenticator_test_mojo_bindings", ":authenticator_test_mojo_bindings",
":web_client_hints_types_mojo_bindings",
"//components/services/font/public/interfaces", "//components/services/font/public/interfaces",
"//device/bluetooth/public/mojom", "//device/bluetooth/public/mojom",
"//mojo/public/mojom/base", "//mojo/public/mojom/base",
...@@ -811,15 +810,6 @@ group("generate_mojo_bindings") { ...@@ -811,15 +810,6 @@ group("generate_mojo_bindings") {
] ]
} }
# The web_feature_mojo_bindings is separated from the rest of the mojom files
# because the chromium typemap for blink mojo_bindings has private content
# dependencies.
mojom("web_client_hints_types_mojo_bindings") {
sources = [
"platform/web_client_hints_types.mojom",
]
}
# This is a separate target because it needs unscrambled message IDs. # This is a separate target because it needs unscrambled message IDs.
mojom("authenticator_test_mojo_bindings") { mojom("authenticator_test_mojo_bindings") {
sources = [ sources = [
......
...@@ -113,6 +113,7 @@ mojom("mojom_platform") { ...@@ -113,6 +113,7 @@ mojom("mojom_platform") {
":android_mojo_bindings", ":android_mojo_bindings",
":mojom_mhtml_load_result", ":mojom_mhtml_load_result",
":speech_recognition_error_code", ":speech_recognition_error_code",
":web_client_hints_types_mojo_bindings",
":web_feature_mojo_bindings", ":web_feature_mojo_bindings",
"//components/payments/mojom", "//components/payments/mojom",
"//components/services/filesystem/public/interfaces", "//components/services/filesystem/public/interfaces",
...@@ -305,3 +306,12 @@ mojom_component("web_feature_mojo_bindings") { ...@@ -305,3 +306,12 @@ mojom_component("web_feature_mojo_bindings") {
macro_prefix = "WEB_FEATURE_MOJO_BINDINGS_MOJOM" macro_prefix = "WEB_FEATURE_MOJO_BINDINGS_MOJOM"
output_prefix = "web_feature_mojo_bindings_mojom" output_prefix = "web_feature_mojo_bindings_mojom"
} }
# The web_client_hints_types_mojo_bindings is separated from the rest of the
# mojom files because the chromium typemap for blink mojo_bindings has private
# content dependencies.
mojom("web_client_hints_types_mojo_bindings") {
sources = [
"web_client_hints/web_client_hints_types.mojom",
]
}
per-file *.mojom=set noparent
per-file *.mojom=file://ipc/SECURITY_OWNERS
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_CLIENT_HINTS_TYPE_H_ #ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_CLIENT_HINTS_TYPE_H_
#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_CLIENT_HINTS_TYPE_H_ #define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_CLIENT_HINTS_TYPE_H_
#include "third_party/blink/public/platform/web_client_hints_types.mojom-shared.h" #include "third_party/blink/public/mojom/web_client_hints/web_client_hints_types.mojom-shared.h"
namespace blink { namespace blink {
......
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