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

Unified Diff: services/ui/ws/platform_display_default.cc

Issue 2555893002: Remove mustash tests from X11 CrOS trybots. (Closed)
Patch Set: No PlatformWindow for X11 CrOS. Created 4 years 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 | « no previous file | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/platform_display_default.cc
diff --git a/services/ui/ws/platform_display_default.cc b/services/ui/ws/platform_display_default.cc
index 11f105d675ea49025ae95c3d1f6582d3a46404da..415306896fd640e559b21ce860768df1f1898fdd 100644
--- a/services/ui/ws/platform_display_default.cc
+++ b/services/ui/ws/platform_display_default.cc
@@ -17,7 +17,7 @@
#if defined(OS_WIN)
#include "ui/platform_window/win/win_window.h"
-#elif defined(USE_X11)
+#elif defined(USE_X11) && !defined(OS_CHROMEOS)
#include "ui/platform_window/x11/x11_window.h"
#elif defined(OS_ANDROID)
#include "ui/platform_window/android/platform_window_android.h"
@@ -59,7 +59,7 @@ void PlatformDisplayDefault::Init(PlatformDisplayDelegate* delegate) {
gfx::Rect bounds(metrics_.bounds.origin(), metrics_.pixel_size);
#if defined(OS_WIN)
platform_window_ = base::MakeUnique<ui::WinWindow>(this, bounds);
-#elif defined(USE_X11)
+#elif defined(USE_X11) && !defined(OS_CHROMEOS)
platform_window_ = base::MakeUnique<ui::X11Window>(this);
platform_window_->SetBounds(bounds);
#elif defined(OS_ANDROID)
« no previous file with comments | « no previous file | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698