summaryrefslogtreecommitdiffstats
path: root/mojo/shell
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 14:49:17 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 14:49:17 +0000
commit0c8b23994c8bd3d322357bf4948c9bcc313f6768 (patch)
tree0dedd15496e4723c87b56af393b6b366e33edadb /mojo/shell
parent0d10513c3ddfeef6b25a93ed30b12eb0ff9e3c74 (diff)
downloadchromium_src-0c8b23994c8bd3d322357bf4948c9bcc313f6768.zip
chromium_src-0c8b23994c8bd3d322357bf4948c9bcc313f6768.tar.gz
chromium_src-0c8b23994c8bd3d322357bf4948c9bcc313f6768.tar.bz2
Mojo: Move mojo/public/bindings/*.h to mojo/public/cpp/bindings/*.h.
I'll do bindings/{lib,tests} separately. R=darin@chromium.org Review URL: https://codereview.chromium.org/218613010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
-rw-r--r--mojo/shell/app_child_process.cc2
-rw-r--r--mojo/shell/app_child_process_host.h2
-rw-r--r--mojo/shell/out_of_process_dynamic_service_runner.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/mojo/shell/app_child_process.cc b/mojo/shell/app_child_process.cc
index 5e2e9b7..7909d83 100644
--- a/mojo/shell/app_child_process.cc
+++ b/mojo/shell/app_child_process.cc
@@ -20,7 +20,7 @@
#include "base/threading/thread_checker.h"
#include "mojo/common/message_pump_mojo.h"
#include "mojo/embedder/embedder.h"
-#include "mojo/public/bindings/remote_ptr.h"
+#include "mojo/public/cpp/bindings/remote_ptr.h"
#include "mojo/public/cpp/system/core.h"
#include "mojo/shell/app_child_process.mojom.h"
diff --git a/mojo/shell/app_child_process_host.h b/mojo/shell/app_child_process_host.h
index 8ecc6e9..04dc4c7 100644
--- a/mojo/shell/app_child_process_host.h
+++ b/mojo/shell/app_child_process_host.h
@@ -6,7 +6,7 @@
#define MOJO_SHELL_APP_CHILD_PROCESS_HOST_H_
#include "base/macros.h"
-#include "mojo/public/bindings/remote_ptr.h"
+#include "mojo/public/cpp/bindings/remote_ptr.h"
#include "mojo/shell/app_child_process.mojom.h"
#include "mojo/shell/child_process_host.h"
diff --git a/mojo/shell/out_of_process_dynamic_service_runner.cc b/mojo/shell/out_of_process_dynamic_service_runner.cc
index 05a898b..a907c85 100644
--- a/mojo/shell/out_of_process_dynamic_service_runner.cc
+++ b/mojo/shell/out_of_process_dynamic_service_runner.cc
@@ -9,7 +9,7 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/scoped_native_library.h"
-#include "mojo/public/bindings/allocation_scope.h"
+#include "mojo/public/cpp/bindings/allocation_scope.h"
namespace mojo {
namespace shell {