diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 07:08:19 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 07:08:19 +0000 |
| commit | ca3132b9398ae2d4024fa9ac810e032a78e571cd (patch) | |
| tree | 6cda2889b4427bf1fe636ae67161da191ca28e25 /mojo/examples/compositor_app | |
| parent | 6e4a5e83abcf1b8ecf352be79bc962db7580ea5f (diff) | |
| download | chromium_src-ca3132b9398ae2d4024fa9ac810e032a78e571cd.zip chromium_src-ca3132b9398ae2d4024fa9ac810e032a78e571cd.tar.gz chromium_src-ca3132b9398ae2d4024fa9ac810e032a78e571cd.tar.bz2 | |
Revert "Move geometry to mojo/services, extract input events to their own mojom"
Suspected to break compile step:
http://build.chromium.org/p/chromium/builders/Linux/builds/50125/steps/compile/logs/stdio#error1
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Mac/builds/18148/steps/compile/logs/stdio#error1
> Move geometry to mojo/services, extract input events to their own mojom
>
> R=sky@chromium.org
> TBR=sky@chromium.org
> http://crbug.com/365012
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=273161
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/304673002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/compositor_app')
| -rw-r--r-- | mojo/examples/compositor_app/compositor_app.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc index 583f4e9..c225fae 100644 --- a/mojo/examples/compositor_app/compositor_app.cc +++ b/mojo/examples/compositor_app/compositor_app.cc @@ -8,13 +8,13 @@ #include "base/macros.h" #include "base/message_loop/message_loop.h" #include "mojo/examples/compositor_app/compositor_host.h" +#include "mojo/geometry/geometry_type_converters.h" #include "mojo/public/cpp/application/application.h" #include "mojo/public/cpp/bindings/allocation_scope.h" #include "mojo/public/cpp/gles2/gles2.h" #include "mojo/public/cpp/system/core.h" #include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/native_viewport/native_viewport.mojom.h" -#include "mojo/services/public/cpp/geometry/geometry_type_converters.h" #include "ui/gfx/rect.h" #if defined(WIN32) |