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

Unified Diff: views/desktop/desktop_window_view.cc

Issue 7464027: Wayland support for views. views_desktop on Wayland. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated files to latest and fixed changes for dependent CLs Created 9 years, 4 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: views/desktop/desktop_window_view.cc
diff --git a/views/desktop/desktop_window_view.cc b/views/desktop/desktop_window_view.cc
index cbba354fb5c92b9505bdc9c07537dcddd142f803..91fbd5a638ee9be75e966179826225e974a10676 100644
--- a/views/desktop/desktop_window_view.cc
+++ b/views/desktop/desktop_window_view.cc
@@ -16,6 +16,8 @@
#if defined(OS_WIN)
#include "views/widget/native_widget_win.h"
+#elif defined(USE_WAYLAND)
+#include "views/widget/native_widget_wayland.h"
#elif defined(TOOLKIT_USES_GTK)
#include "views/widget/native_widget_gtk.h"
#endif
@@ -136,6 +138,8 @@ void DesktopWindowView::CreateDesktopWindow(DesktopType type) {
#if defined(OS_WIN)
params.native_widget = new views::NativeWidgetWin(window);
params.bounds = gfx::Rect(20, 20, 1920, 1200);
+#elif defined(USE_WAYLAND)
+ params.native_widget = new views::NativeWidgetWayland(window);
#elif defined(TOOLKIT_USES_GTK)
params.native_widget = new views::NativeWidgetGtk(window);
#endif

Powered by Google App Engine
This is Rietveld 408576698