| Index: ui/ozone/platform/wayland/wayland_connection.h
|
| diff --git a/ui/ozone/platform/wayland/wayland_display.h b/ui/ozone/platform/wayland/wayland_connection.h
|
| similarity index 81%
|
| rename from ui/ozone/platform/wayland/wayland_display.h
|
| rename to ui/ozone/platform/wayland/wayland_connection.h
|
| index d63945a8a69050d9af00fc92489600ac0ddede6b..109bbe424fd7e8eafeaa79fdbe7a9d41df52a713 100644
|
| --- a/ui/ozone/platform/wayland/wayland_display.h
|
| +++ b/ui/ozone/platform/wayland/wayland_connection.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_
|
| -#define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_
|
| +#ifndef UI_OZONE_PLATFORM_WAYLAND_WAYLAND_CONNECTION_H_
|
| +#define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_CONNECTION_H_
|
|
|
| #include <map>
|
|
|
| @@ -11,17 +11,18 @@
|
| #include "ui/events/platform/platform_event_source.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/ozone/platform/wayland/wayland_object.h"
|
| +#include "ui/ozone/platform/wayland/wayland_output.h"
|
| #include "ui/ozone/platform/wayland/wayland_pointer.h"
|
|
|
| namespace ui {
|
|
|
| class WaylandWindow;
|
|
|
| -class WaylandDisplay : public PlatformEventSource,
|
| - public base::MessagePumpLibevent::Watcher {
|
| +class WaylandConnection : public PlatformEventSource,
|
| + public base::MessagePumpLibevent::Watcher {
|
| public:
|
| - WaylandDisplay();
|
| - ~WaylandDisplay() override;
|
| + WaylandConnection();
|
| + ~WaylandConnection() override;
|
|
|
| bool Initialize();
|
| bool StartProcessingEvents();
|
| @@ -38,6 +39,9 @@ class WaylandDisplay : public PlatformEventSource,
|
| void AddWindow(gfx::AcceleratedWidget widget, WaylandWindow* window);
|
| void RemoveWindow(gfx::AcceleratedWidget widget);
|
|
|
| + const std::vector<WaylandOutput*>& GetOutputList() const;
|
| + WaylandOutput* PrimaryOutput() const;
|
| +
|
| private:
|
| void Flush();
|
| void DispatchUiEvent(Event* event);
|
| @@ -79,7 +83,9 @@ class WaylandDisplay : public PlatformEventSource,
|
| bool watching_ = false;
|
| base::MessagePumpLibevent::FileDescriptorWatcher controller_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(WaylandDisplay);
|
| + std::vector<WaylandOutput*> output_list_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(WaylandConnection);
|
| };
|
|
|
| } // namespace ui
|
|
|