| Index: ui/display/manager/chromeos/x11/native_display_delegate_x11.cc
|
| diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.cc b/ui/display/manager/chromeos/x11/native_display_delegate_x11.cc
|
| similarity index 98%
|
| rename from ui/display/chromeos/x11/native_display_delegate_x11.cc
|
| rename to ui/display/manager/chromeos/x11/native_display_delegate_x11.cc
|
| index 3cbfe69eb377ca1d5c58dbe91796162f7ccdb8c8..5a0b4f5951c0044158a170bf8af0012509947562 100644
|
| --- a/ui/display/chromeos/x11/native_display_delegate_x11.cc
|
| +++ b/ui/display/manager/chromeos/x11/native_display_delegate_x11.cc
|
| @@ -2,23 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ui/display/chromeos/x11/native_display_delegate_x11.h"
|
| +#include "ui/display/manager/chromeos/x11/native_display_delegate_x11.h"
|
|
|
| #include <X11/Xatom.h>
|
| #include <X11/Xlib.h>
|
| #include <X11/extensions/dpms.h>
|
| -#include <X11/extensions/Xrandr.h>
|
| #include <X11/extensions/XInput2.h>
|
| +#include <X11/extensions/Xrandr.h>
|
|
|
| #include <utility>
|
|
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ptr_util.h"
|
| -#include "ui/display/chromeos/x11/display_mode_x11.h"
|
| -#include "ui/display/chromeos/x11/display_snapshot_x11.h"
|
| -#include "ui/display/chromeos/x11/display_util_x11.h"
|
| -#include "ui/display/chromeos/x11/native_display_event_dispatcher_x11.h"
|
| +#include "ui/display/manager/chromeos/x11/display_mode_x11.h"
|
| +#include "ui/display/manager/chromeos/x11/display_snapshot_x11.h"
|
| +#include "ui/display/manager/chromeos/x11/display_util_x11.h"
|
| +#include "ui/display/manager/chromeos/x11/native_display_event_dispatcher_x11.h"
|
| #include "ui/display/types/native_display_observer.h"
|
| #include "ui/display/util/x11/edid_parser_x11.h"
|
| #include "ui/events/platform/platform_event_source.h"
|
| @@ -156,7 +156,9 @@ void NativeDisplayDelegateX11::RelinquishDisplayControl(
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -void NativeDisplayDelegateX11::SyncWithServer() { XSync(display_, 0); }
|
| +void NativeDisplayDelegateX11::SyncWithServer() {
|
| + XSync(display_, 0);
|
| +}
|
|
|
| void NativeDisplayDelegateX11::SetBackgroundColor(uint32_t color_argb) {
|
| background_color_argb_ = color_argb;
|
| @@ -591,7 +593,6 @@ bool NativeDisplayDelegateX11::IsOutputAspectPreservingScaling(RROutput id) {
|
| return false;
|
| }
|
|
|
| -
|
| std::vector<ColorCalibrationProfile>
|
| NativeDisplayDelegateX11::GetAvailableColorCalibrationProfiles(
|
| const DisplaySnapshot& output) {
|
| @@ -612,8 +613,7 @@ bool NativeDisplayDelegateX11::SetColorCalibrationProfile(
|
| return false;
|
|
|
| int gamma_ramp_size = XRRGetCrtcGammaSize(display_, x11_output.crtc());
|
| - XRRSetCrtcGamma(display_,
|
| - x11_output.crtc(),
|
| + XRRSetCrtcGamma(display_, x11_output.crtc(),
|
| ResampleGammaRamp(gamma_ramp, gamma_ramp_size));
|
| XRRFreeGamma(gamma_ramp);
|
| return true;
|
|
|