summaryrefslogtreecommitdiffstats
path: root/mojo/shell
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 20:17:08 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 20:17:08 +0000
commit157552a5a5749f237699c7311f236a3e02e03d14 (patch)
tree5125e84692e58500ea90079ab956b1021766f733 /mojo/shell
parent3d51cb40f043bf9de930482ff8055aee36e02b96 (diff)
downloadchromium_src-157552a5a5749f237699c7311f236a3e02e03d14.zip
chromium_src-157552a5a5749f237699c7311f236a3e02e03d14.tar.gz
chromium_src-157552a5a5749f237699c7311f236a3e02e03d14.tar.bz2
Mojo: Move mojo/public/shell to mojo/public/{cpp,interfaces}/shell.
R=darin@chromium.org Review URL: https://codereview.chromium.org/219583003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260627 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
-rw-r--r--mojo/shell/android/mojo_main.cc2
-rw-r--r--mojo/shell/dynamic_service_loader.h2
-rw-r--r--mojo/shell/dynamic_service_runner.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc
index a6eb580..a912864 100644
--- a/mojo/shell/android/mojo_main.cc
+++ b/mojo/shell/android/mojo_main.cc
@@ -13,7 +13,7 @@
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "jni/MojoMain_jni.h"
-#include "mojo/public/shell/application.h"
+#include "mojo/public/cpp/shell/application.h"
#include "mojo/service_manager/service_loader.h"
#include "mojo/service_manager/service_manager.h"
#include "mojo/services/native_viewport/native_viewport_service.h"
diff --git a/mojo/shell/dynamic_service_loader.h b/mojo/shell/dynamic_service_loader.h
index 6b8e7dc..456295b 100644
--- a/mojo/shell/dynamic_service_loader.h
+++ b/mojo/shell/dynamic_service_loader.h
@@ -9,7 +9,7 @@
#include "base/macros.h"
#include "mojo/public/cpp/system/core.h"
-#include "mojo/public/shell/shell.mojom.h"
+#include "mojo/public/interfaces/shell/shell.mojom.h"
#include "mojo/service_manager/service_loader.h"
#include "mojo/shell/dynamic_service_runner.h"
#include "mojo/shell/keep_alive.h"
diff --git a/mojo/shell/dynamic_service_runner.h b/mojo/shell/dynamic_service_runner.h
index 0319531..b61f651 100644
--- a/mojo/shell/dynamic_service_runner.h
+++ b/mojo/shell/dynamic_service_runner.h
@@ -8,7 +8,7 @@
#include "base/callback_forward.h"
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
-#include "mojo/public/shell/shell.mojom.h"
+#include "mojo/public/interfaces/shell/shell.mojom.h"
namespace base {
class FilePath;