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

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

Issue 2027943002: [WIP] Make content_shell run under Wayland Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (09.28.2016)Rebase on master Created 4 years, 3 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_connection.h
diff --git a/ui/ozone/platform/wayland/wayland_connection.h b/ui/ozone/platform/wayland/wayland_connection.h
index 8f837b586e4b993b7d3a5bdf31a6eca19a2c26ed..abc341b6da24761785c0038ecca3f503acc36dce 100644
--- a/ui/ozone/platform/wayland/wayland_connection.h
+++ b/ui/ozone/platform/wayland/wayland_connection.h
@@ -13,6 +13,7 @@
#include "ui/ozone/platform/wayland/wayland_object.h"
#include "ui/ozone/platform/wayland/wayland_output.h"
#include "ui/ozone/platform/wayland/wayland_pointer.h"
+#include "ui/ozone/public/ozone_platform_screen_delegate.h"
namespace ui {
@@ -26,6 +27,7 @@ class WaylandConnection : public PlatformEventSource,
bool Initialize();
bool StartProcessingEvents();
+ static WaylandConnection* GetInstance() { return instance_; }
// Schedules a flush of the Wayland connection.
void ScheduleFlush();
@@ -41,6 +43,8 @@ class WaylandConnection : public PlatformEventSource,
const std::vector<std::unique_ptr<WaylandOutput>>& GetOutputList() const;
WaylandOutput* PrimaryOutput() const;
+ void SetOutputObserver(OzonePlatformScreenDelegate*);
+ void OnOutputGeometryChanged(int32_t name, const gfx::Rect&);
private:
void Flush();
@@ -69,6 +73,7 @@ class WaylandConnection : public PlatformEventSource,
static void Ping(void* data, xdg_shell* shell, uint32_t serial);
std::map<gfx::AcceleratedWidget, WaylandWindow*> window_map_;
+ static WaylandConnection* instance_;
wl::Object<wl_display> display_;
wl::Object<wl_registry> registry_;
@@ -84,6 +89,7 @@ class WaylandConnection : public PlatformEventSource,
base::MessagePumpLibevent::FileDescriptorWatcher controller_;
std::vector<std::unique_ptr<WaylandOutput>> output_list_;
+ OzonePlatformScreenDelegate* output_observer_;
DISALLOW_COPY_AND_ASSIGN(WaylandConnection);
};
« no previous file with comments | « ui/ozone/platform/wayland/ozone_platform_wayland.cc ('k') | ui/ozone/platform/wayland/wayland_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698