1 files changed, 20 insertions, 52 deletions
diff --git a/src/core/desktop_screen_qt.h b/src/core/desktop_screen_qt.h
index 0c52c615a..a322c4840 100644
--- a/src/core/desktop_screen_qt.h
+++ b/src/core/desktop_screen_qt.h
@@ -1,63 +1,31 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef DESKTOP_SCREEN_QT_H
 #define DESKTOP_SCREEN_QT_H
 
-#include "ui/display/screen.h"
+#include "ui/display/screen_base.h"
+
+#include <qmetaobject.h>
 
 namespace QtWebEngineCore {
 
-class DesktopScreenQt : public display::Screen {
+class DesktopScreenQt : public display::ScreenBase
+{
 public:
-    // Overridden from gfx::Screen:
-    gfx::Point GetCursorScreenPoint() override;
-    bool IsWindowUnderCursor(gfx::NativeWindow) override;
-    gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
-    int GetNumDisplays() const override;
-    std::vector<display::Display>& GetAllDisplays() const override;
-    display::Display GetDisplayNearestWindow(gfx::NativeWindow window) const override;
-    display::Display GetDisplayNearestPoint(const gfx::Point& point) const override;
-    display::Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
-    display::Display GetPrimaryDisplay() const override;
-    void AddObserver(display::DisplayObserver* observer) override;
-    void RemoveObserver(display::DisplayObserver* observer) override;
+    DesktopScreenQt();
+    ~DesktopScreenQt() override;
+
+    display::Display GetDisplayNearestWindow(gfx::NativeWindow /*window*/) const override;
+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+    std::unique_ptr<ScreenSaverSuspender> SuspendScreenSaver() override;
+#endif
+    bool IsScreenSaverActive() const override;
+
+private:
+    void initializeScreens();
+    bool updateAllScreens();
+    QMetaObject::Connection m_connections[3];
 };
 
 } // namespace QtWebEngineCore