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

Unified Diff: ui/ozone/platform/wayland/wayland_connection_unittest.cc

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
« no previous file with comments | « ui/ozone/platform/wayland/wayland_connection.cc ('k') | ui/ozone/platform/wayland/wayland_output.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/wayland/wayland_connection_unittest.cc
diff --git a/ui/ozone/platform/wayland/wayland_connection_unittest.cc b/ui/ozone/platform/wayland/wayland_connection_unittest.cc
index b261ec161229a173188bef640e8d935351968aae..fce836308f40b628cdb1e344826c93c01a27a89c 100644
--- a/ui/ozone/platform/wayland/wayland_connection_unittest.cc
+++ b/ui/ozone/platform/wayland/wayland_connection_unittest.cc
@@ -9,15 +9,15 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/ozone/platform/wayland/fake_server.h"
#include "ui/ozone/platform/wayland/wayland_connection.h"
-#include "ui/ozone/platform/wayland/wayland_output.h"
+#include "ui/ozone/public/ozone_platform_screen_delegate.h"
namespace ui {
-class OutputObserver : public WaylandOutput::Observer {
+class OutputObserver : public ui::OzonePlatformScreenDelegate {
public:
explicit OutputObserver(const base::Closure& closure) : closure_(closure) {}
- void OnOutputReadyForUse() override {
+ void OnOutputGeometryChanged(int32_t name, const gfx::Rect& rect) override {
if (!closure_.is_null())
closure_.Run();
}
@@ -70,7 +70,7 @@ TEST(WaylandConnectionTest, Output) {
base::RunLoop run_loop;
OutputObserver observer(run_loop.QuitClosure());
- connection.PrimaryOutput()->SetObserver(&observer);
+ connection.SetOutputObserver(&observer);
run_loop.Run();
ASSERT_TRUE(connection.GetOutputList().size() == 1);
« no previous file with comments | « ui/ozone/platform/wayland/wayland_connection.cc ('k') | ui/ozone/platform/wayland/wayland_output.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698