Commit 66782d2a authored by kylechar's avatar kylechar Committed by Commit Bot

Fix switching to VT2 with mus/mash.

Switching to VT2 on Chrome OS with --mus or --mash was broken on some
boards due to copy and paste errors calling the wrong function.

Bug: 777571, 772023
Change-Id: I4f77ae795bd5cd19b767e6bb9e40c4a28d08c2c3
Reviewed-on: https://chromium-review.googlesource.com/748812Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513160}
parent 67b9d2c3
...@@ -38,7 +38,7 @@ void ForwardingDisplayDelegate::TakeDisplayControl( ...@@ -38,7 +38,7 @@ void ForwardingDisplayDelegate::TakeDisplayControl(
void ForwardingDisplayDelegate::RelinquishDisplayControl( void ForwardingDisplayDelegate::RelinquishDisplayControl(
const DisplayControlCallback& callback) { const DisplayControlCallback& callback) {
delegate_->TakeDisplayControl(callback); delegate_->RelinquishDisplayControl(callback);
} }
void ForwardingDisplayDelegate::GetDisplays( void ForwardingDisplayDelegate::GetDisplays(
......
...@@ -236,7 +236,7 @@ bool HostDrmDevice::GpuRelinquishDisplayControl() { ...@@ -236,7 +236,7 @@ bool HostDrmDevice::GpuRelinquishDisplayControl() {
auto callback = auto callback =
base::BindOnce(&HostDrmDevice::GpuRelinquishDisplayControlCallback, base::BindOnce(&HostDrmDevice::GpuRelinquishDisplayControlCallback,
weak_ptr_factory_.GetWeakPtr()); weak_ptr_factory_.GetWeakPtr());
drm_device_ptr_->TakeDisplayControl(std::move(callback)); drm_device_ptr_->RelinquishDisplayControl(std::move(callback));
return true; return true;
} }
......
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