Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Unified Diff: ui/ozone/platform/wayland/wayland_display.h

Issue 2042503002: ozone/platform/wayland: Add support for wl_output_interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hide the use of the base::Closure Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/wayland/wayland_display.h
diff --git a/ui/ozone/platform/wayland/wayland_display.h b/ui/ozone/platform/wayland/wayland_display.h
index d63945a8a69050d9af00fc92489600ac0ddede6b..cb1823859769997d1fb245e58de935b26d7cc993 100644
--- a/ui/ozone/platform/wayland/wayland_display.h
+++ b/ui/ozone/platform/wayland/wayland_display.h
@@ -12,6 +12,7 @@
#include "ui/gfx/native_widget_types.h"
#include "ui/ozone/platform/wayland/wayland_object.h"
#include "ui/ozone/platform/wayland/wayland_pointer.h"
+#include "ui/ozone/platform/wayland/wayland_screen.h"
namespace ui {
@@ -38,6 +39,9 @@ class WaylandDisplay : public PlatformEventSource,
void AddWindow(gfx::AcceleratedWidget widget, WaylandWindow* window);
void RemoveWindow(gfx::AcceleratedWidget widget);
+ const std::vector<WaylandScreen*>& GetScreenList() const;
rjkroege 2016/06/14 23:29:48 you need method comments
+ WaylandScreen* PrimaryScreen() const;
+
private:
void Flush();
void DispatchUiEvent(Event* event);
@@ -65,6 +69,7 @@ class WaylandDisplay : public PlatformEventSource,
static void Ping(void* data, xdg_shell* shell, uint32_t serial);
std::map<gfx::AcceleratedWidget, WaylandWindow*> window_map_;
+ static WaylandDisplay* instance_;
wl::Object<wl_display> display_;
wl::Object<wl_registry> registry_;
@@ -79,6 +84,8 @@ class WaylandDisplay : public PlatformEventSource,
bool watching_ = false;
base::MessagePumpLibevent::FileDescriptorWatcher controller_;
+ std::vector<WaylandScreen*> screen_list_;
+
DISALLOW_COPY_AND_ASSIGN(WaylandDisplay);
};

Powered by Google App Engine
This is Rietveld 408576698