bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 93.0.4577.0 (#902210)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-07-23 12:40:13 -04:00
parent 1ffa5528b3
commit b4ea0496e7
141 changed files with 1188 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libcef/browser/media_router/media_route_impl.cc
View File

@@ -38,7 +38,11 @@ CefRefPtr<CefMediaSource> CefMediaRouteImpl::GetSource() {
}
CefRefPtr<CefMediaSink> CefMediaRouteImpl::GetSink() {
return new CefMediaSinkImpl(route_.media_sink_id(), route_.media_sink_name());
return new CefMediaSinkImpl(
route_.media_sink_id(), route_.media_sink_name(),
route_.media_source().IsDialSource()
? media_router::mojom::MediaRouteProviderId::DIAL
: media_router::mojom::MediaRouteProviderId::CAST);
}
void CefMediaRouteImpl::SendRouteMessage(const void* message,

15
libcef/browser/media_router/media_sink_impl.cc
View File

@@ -85,9 +85,14 @@ void GetDeviceInfo(const media_router::MediaSink::Id& sink_id,
CefMediaSinkImpl::CefMediaSinkImpl(const media_router::MediaSink& sink)
: sink_(sink) {}
CefMediaSinkImpl::CefMediaSinkImpl(const media_router::MediaSink::Id& sink_id,
const std::string& sink_name)
: sink_(sink_id, sink_name, media_router::SinkIconType::GENERIC) {}
CefMediaSinkImpl::CefMediaSinkImpl(
const media_router::MediaSink::Id& sink_id,
const std::string& sink_name,
media_router::mojom::MediaRouteProviderId provider_id)
: sink_(sink_id,
sink_name,
media_router::SinkIconType::GENERIC,
provider_id) {}
CefString CefMediaSinkImpl::GetId() {
return sink_.id();
@@ -116,11 +121,11 @@ void CefMediaSinkImpl::GetDeviceInfo(
}
bool CefMediaSinkImpl::IsCastSink() {
return sink_.provider_id() == media_router::CAST;
return sink_.provider_id() == media_router::mojom::MediaRouteProviderId::CAST;
}
bool CefMediaSinkImpl::IsDialSink() {
return sink_.provider_id() == media_router::DIAL;
return sink_.provider_id() == media_router::mojom::MediaRouteProviderId::DIAL;
}
bool CefMediaSinkImpl::IsCompatibleWith(CefRefPtr<CefMediaSource> source) {

3
libcef/browser/media_router/media_sink_impl.h
View File

@@ -15,7 +15,8 @@ class CefMediaSinkImpl : public CefMediaSink {
public:
explicit CefMediaSinkImpl(const media_router::MediaSink& sink);
CefMediaSinkImpl(const media_router::MediaSink::Id& sink_id,
const std::string& sink_name);
const std::string& sink_name,
media_router::mojom::MediaRouteProviderId provider_id);
// CefMediaSink methods.
CefString GetId() override;