chromium/src
0
Fork 0
Code Activity

Update #include paths for some WebRTC headers for Wayland.

Browse Source 
Some WebRTC headers were moved from
modules/desktop_capture/linux/wayland/ to modules/portal/,
leaving shims in the old location. This CL updates the callers to use
the new location.

Bug: webrtc:14187
Change-Id: I6461e2d84f746c7c688a87c06b2a00cc751ff27c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5034466
Reviewed-by: Erik Jensen <rkjnsn@chromium.org>
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Lambros Lambrou <lambroslambrou@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1225612}
This commit is contained in:
Lambros Lambrou
2023-11-16 18:42:15 +00:00
committed by Chromium LUCI CQ
parent 046e21affe
commit efbe100824
13 changed files with 27 additions and 24 deletions

2
remoting/host/client_session.cc

@ -58,7 +58,7 @@
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
#if defined(WEBRTC_USE_GIO)
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.h"
#include "third_party/webrtc/modules/portal/xdg_desktop_portal_utils.h"
#endif
namespace {

2
remoting/host/input_injector_metadata.h

@ -6,7 +6,7 @@
#define REMOTING_HOST_INPUT_INJECTOR_METADATA_H_
#if defined(WEBRTC_USE_PIPEWIRE)
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.h"
#include "third_party/webrtc/modules/portal/xdg_desktop_portal_utils.h"
#endif // defined(WEBRTC_USE_PIPEWIRE)
namespace remoting {

6
remoting/host/linux/clipboard_portal.cc

@ -10,9 +10,9 @@
#include "base/check.h"
#include "remoting/base/logging.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/portal_request_response.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/scoped_glib.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.h"
#include "third_party/webrtc/modules/portal/portal_request_response.h"
#include "third_party/webrtc/modules/portal/scoped_glib.h"
#include "third_party/webrtc/modules/portal/xdg_desktop_portal_utils.h"
namespace remoting::xdg_portal {
namespace {

4
remoting/host/linux/clipboard_portal.h

@ -9,8 +9,8 @@
#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/portal_request_response.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h"
#include "third_party/webrtc/modules/portal/portal_request_response.h"
#include "third_party/webrtc/modules/portal/xdg_session_details.h"
namespace remoting::xdg_portal {

4
remoting/host/linux/clipboard_portal_injector.cc

@ -16,8 +16,8 @@
#include "base/strings/string_util.h"
#include "remoting/base/constants.h"
#include "remoting/base/logging.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/scoped_glib.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.h"
#include "third_party/webrtc/modules/portal/scoped_glib.h"
#include "third_party/webrtc/modules/portal/xdg_desktop_portal_utils.h"
namespace remoting::xdg_portal {
namespace {

2
remoting/host/linux/clipboard_portal_injector.h

@ -13,7 +13,7 @@
#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h"
#include "third_party/webrtc/modules/portal/xdg_session_details.h"
namespace remoting::xdg_portal {

4
remoting/host/linux/input_injector_wayland.cc

@ -34,8 +34,8 @@
#include "remoting/host/linux/wayland_manager.h"
#include "remoting/proto/internal.pb.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/scoped_glib.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.h"
#include "third_party/webrtc/modules/portal/scoped_glib.h"
#include "third_party/webrtc/modules/portal/xdg_desktop_portal_utils.h"
#include "ui/events/keycodes/dom/dom_code.h"
#include "ui/events/keycodes/dom/keycode_converter.h"

2
remoting/host/linux/remote_desktop_portal.cc

@ -16,7 +16,7 @@
#include "remoting/base/logging.h"
#include "remoting/host/linux/clipboard_portal.h"
#include "remoting/host/linux/wayland_manager.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.h"
#include "third_party/webrtc/modules/portal/xdg_desktop_portal_utils.h"
namespace remoting::xdg_portal {
namespace {

10
remoting/host/linux/remote_desktop_portal.h

@ -13,14 +13,14 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
#include "clipboard_portal.h"
#include "remoting/host/linux/clipboard_portal.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/portal_request_response.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/scoped_glib.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/screencast_portal.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h"
#include "third_party/webrtc/modules/portal/portal_request_response.h"
#include "third_party/webrtc/modules/portal/scoped_glib.h"
#include "third_party/webrtc/modules/portal/xdg_desktop_portal_utils.h"
#include "third_party/webrtc/modules/portal/xdg_session_details.h"
namespace remoting::xdg_portal {

6
remoting/host/linux/remote_desktop_portal_injector.cc

@ -18,9 +18,9 @@
#include "base/time/time.h"
#include "remoting/base/logging.h"
#include "third_party/libei/include/libei.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/portal_request_response.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/scoped_glib.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.h"
#include "third_party/webrtc/modules/portal/portal_request_response.h"
#include "third_party/webrtc/modules/portal/scoped_glib.h"
#include "third_party/webrtc/modules/portal/xdg_desktop_portal_utils.h"
namespace remoting::xdg_portal {

4
remoting/host/linux/remote_desktop_portal_injector.h

@ -18,8 +18,8 @@
#include "third_party/libei/include/libei.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/screencast_portal.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h"
#include "third_party/webrtc/modules/portal/xdg_desktop_portal_utils.h"
#include "third_party/webrtc/modules/portal/xdg_session_details.h"
namespace remoting::xdg_portal {

2
remoting/host/linux/wayland_desktop_capturer.cc

@ -11,7 +11,7 @@
#include "remoting/host/linux/wayland_manager.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h"
#include "third_party/webrtc/modules/portal/xdg_session_details.h"
namespace remoting {

3
third_party/webrtc_overrides/BUILD.gn vendored

@ -161,6 +161,9 @@ if (is_castos || is_cast_android || is_nacl) {
# for how that is done.
webrtc_public_deps += [ ":field_trial" ]
}
if ((is_linux || is_chromeos) && rtc_use_pipewire) {
webrtc_public_deps += [ "//third_party/webrtc/modules/portal" ]
}
component("webrtc_component") {
configs += webrtc_configs