diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 23:41:34 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 23:41:34 +0000 |
| commit | fadab2ebbefc8dfcec3b25dc6324612a3b9ff565 (patch) | |
| tree | d9d4aa7ca0b84bef47c22c7c7aacc1af340a7984 /mojo/shell/android | |
| parent | 33fdddfddcca933851c1a3044d0d881cd5455dfd (diff) | |
| download | chromium_src-fadab2ebbefc8dfcec3b25dc6324612a3b9ff565.zip chromium_src-fadab2ebbefc8dfcec3b25dc6324612a3b9ff565.tar.gz chromium_src-fadab2ebbefc8dfcec3b25dc6324612a3b9ff565.tar.bz2 | |
Move service_manager to top level dir
BUG=None
TEST=Existing
TBR=darin
Review URL: https://codereview.chromium.org/180243020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell/android')
| -rw-r--r-- | mojo/shell/android/mojo_main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc index 951742f..987cdfd 100644 --- a/mojo/shell/android/mojo_main.cc +++ b/mojo/shell/android/mojo_main.cc @@ -13,11 +13,11 @@ #include "base/message_loop/message_loop.h" #include "jni/MojoMain_jni.h" #include "mojo/public/shell/application.h" +#include "mojo/service_manager/service_manager.h" #include "mojo/services/native_viewport/native_viewport_service.h" #include "mojo/shell/context.h" #include "mojo/shell/init.h" #include "mojo/shell/run.h" -#include "mojo/shell/service_manager.h" #include "ui/gl/gl_surface_egl.h" using base::LazyInstance; |