diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 00:53:27 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 00:53:27 +0000 |
| commit | 5dddd197efdfc27a7f7701f2f9b5965aa68b771e (patch) | |
| tree | c5ac6281af8bdad4f2460a139903ae533e804a85 /mojo/shell | |
| parent | d232ef502b92b99c405fff9b0ecf9cccd2813398 (diff) | |
| download | chromium_src-5dddd197efdfc27a7f7701f2f9b5965aa68b771e.zip chromium_src-5dddd197efdfc27a7f7701f2f9b5965aa68b771e.tar.gz chromium_src-5dddd197efdfc27a7f7701f2f9b5965aa68b771e.tar.bz2 | |
Mojo: Move mojo/public/system/core_cpp.h to mojo/cpp/public/system/core.h.
Also begin rearranging tests. (I'm deferring moving macros_unittest.cc
until after I split macros.h.)
R=darin@chromium.org
Review URL: https://codereview.chromium.org/214753004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
| -rw-r--r-- | mojo/shell/app_child_process.cc | 2 | ||||
| -rw-r--r-- | mojo/shell/app_child_process_host.cc | 2 | ||||
| -rw-r--r-- | mojo/shell/dynamic_service_loader.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mojo/shell/app_child_process.cc b/mojo/shell/app_child_process.cc index ebb10e6..5e2e9b7 100644 --- a/mojo/shell/app_child_process.cc +++ b/mojo/shell/app_child_process.cc @@ -21,7 +21,7 @@ #include "mojo/common/message_pump_mojo.h" #include "mojo/embedder/embedder.h" #include "mojo/public/bindings/remote_ptr.h" -#include "mojo/public/system/core_cpp.h" +#include "mojo/public/cpp/system/core.h" #include "mojo/shell/app_child_process.mojom.h" namespace mojo { diff --git a/mojo/shell/app_child_process_host.cc b/mojo/shell/app_child_process_host.cc index 42e5d82..d35da8e 100644 --- a/mojo/shell/app_child_process_host.cc +++ b/mojo/shell/app_child_process_host.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "mojo/embedder/embedder.h" -#include "mojo/public/system/core_cpp.h" +#include "mojo/public/cpp/system/core.h" #include "mojo/shell/context.h" #include "mojo/shell/task_runners.h" diff --git a/mojo/shell/dynamic_service_loader.h b/mojo/shell/dynamic_service_loader.h index aa8a42c..6b8e7dc 100644 --- a/mojo/shell/dynamic_service_loader.h +++ b/mojo/shell/dynamic_service_loader.h @@ -7,9 +7,9 @@ #include <map> -#include "base/basictypes.h" +#include "base/macros.h" +#include "mojo/public/cpp/system/core.h" #include "mojo/public/shell/shell.mojom.h" -#include "mojo/public/system/core_cpp.h" #include "mojo/service_manager/service_loader.h" #include "mojo/shell/dynamic_service_runner.h" #include "mojo/shell/keep_alive.h" |