views/widget/native_widget_wayland.cc - Issue 8581003: views: Move ime and test directories to ui/views.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: views/widget/native_widget_wayland.cc

Issue 8581003: views: Move ime and test directories to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix linux Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: views/widget/native_widget_wayland.cc

diff --git a/views/widget/native_widget_wayland.cc b/views/widget/native_widget_wayland.cc

index cae95f70cdb68c3ec63ec31088e3e08794921085..989d08d5e0e3c6bd01520bc7ae69850dd6e41880 100644

--- a/views/widget/native_widget_wayland.cc

+++ b/views/widget/native_widget_wayland.cc

@@ -4,10 +4,10 @@

#include "views/widget/native_widget_wayland.h"

-#include <cairo.h>

-#include <cairo-gl.h>

#include <EGL/egl.h>

#include <GL/gl.h>

+#include <cairo-gl.h>

+#include <cairo.h>

#include <wayland-egl.h>

#include <algorithm>

@@ -21,11 +21,11 @@

#include "ui/gfx/compositor/compositor.h"

#include "ui/gfx/gl/gl_surface.h"

#include "ui/gfx/gl/gl_surface_egl.h"

+#include "ui/views/ime/input_method_wayland.h"

#include "ui/wayland/wayland_display.h"

#include "ui/wayland/wayland_input_device.h"

#include "ui/wayland/wayland_screen.h"

#include "ui/wayland/wayland_window.h"

-#include "views/ime/input_method_wayland.h"

#include "views/views_delegate.h"

#include "views/widget/native_widget_views.h"

#include "views/widget/root_view.h"

« no previous file with comments | « views/widget/native_widget_views.cc ('k') | views/widget/native_widget_win.cc » ('j') | no next file with comments »