summaryrefslogtreecommitdiffstats
path: root/mojo/service_manager
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/service_manager
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/service_manager')
-rw-r--r--mojo/service_manager/service_manager.cc6
-rw-r--r--mojo/service_manager/service_manager_unittest.cc4
2 files changed, 5 insertions, 5 deletions
diff --git a/mojo/service_manager/service_manager.cc b/mojo/service_manager/service_manager.cc
index 8b80825..ab72bdf 100644
--- a/mojo/service_manager/service_manager.cc
+++ b/mojo/service_manager/service_manager.cc
@@ -9,9 +9,9 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "mojo/public/bindings/allocation_scope.h"
-#include "mojo/public/bindings/error_handler.h"
-#include "mojo/public/bindings/remote_ptr.h"
+#include "mojo/public/cpp/bindings/allocation_scope.h"
+#include "mojo/public/cpp/bindings/error_handler.h"
+#include "mojo/public/cpp/bindings/remote_ptr.h"
#include "mojo/service_manager/service_loader.h"
namespace mojo {
diff --git a/mojo/service_manager/service_manager_unittest.cc b/mojo/service_manager/service_manager_unittest.cc
index 01a3626..dc4e432 100644
--- a/mojo/service_manager/service_manager_unittest.cc
+++ b/mojo/service_manager/service_manager_unittest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "base/message_loop/message_loop.h"
-#include "mojo/public/bindings/allocation_scope.h"
-#include "mojo/public/bindings/remote_ptr.h"
+#include "mojo/public/cpp/bindings/allocation_scope.h"
+#include "mojo/public/cpp/bindings/remote_ptr.h"
#include "mojo/public/cpp/environment/environment.h"
#include "mojo/public/cpp/shell/application.h"
#include "mojo/public/interfaces/shell/shell.mojom.h"