diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 20:17:08 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 20:17:08 +0000 |
| commit | 157552a5a5749f237699c7311f236a3e02e03d14 (patch) | |
| tree | 5125e84692e58500ea90079ab956b1021766f733 /mojo/service_manager | |
| parent | 3d51cb40f043bf9de930482ff8055aee36e02b96 (diff) | |
| download | chromium_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/service_manager')
| -rw-r--r-- | mojo/service_manager/service_loader.h | 2 | ||||
| -rw-r--r-- | mojo/service_manager/service_manager.h | 2 | ||||
| -rw-r--r-- | mojo/service_manager/service_manager_unittest.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mojo/service_manager/service_loader.h b/mojo/service_manager/service_loader.h index 6d5be9a..42b593e 100644 --- a/mojo/service_manager/service_loader.h +++ b/mojo/service_manager/service_loader.h @@ -5,7 +5,7 @@ #ifndef MOJO_SERVICE_MANAGER_SERVICE_LOADER_H_ #define MOJO_SERVICE_MANAGER_SERVICE_LOADER_H_ -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/service_manager/service_manager_export.h" #include "url/gurl.h" diff --git a/mojo/service_manager/service_manager.h b/mojo/service_manager/service_manager.h index 513c792..f2ee988 100644 --- a/mojo/service_manager/service_manager.h +++ b/mojo/service_manager/service_manager.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/gtest_prod_util.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/service_manager/service_manager_export.h" #include "url/gurl.h" diff --git a/mojo/service_manager/service_manager_unittest.cc b/mojo/service_manager/service_manager_unittest.cc index 18ee25f..01a3626 100644 --- a/mojo/service_manager/service_manager_unittest.cc +++ b/mojo/service_manager/service_manager_unittest.cc @@ -6,8 +6,8 @@ #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/cpp/environment/environment.h" -#include "mojo/public/shell/application.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/cpp/shell/application.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/service_manager/service_loader.h" #include "mojo/service_manager/service_manager.h" #include "mojo/service_manager/test.mojom.h" |