| Index: mojo/application/public/cpp/application_impl.h
|
| diff --git a/third_party/mojo/src/mojo/public/cpp/application/application_impl.h b/mojo/application/public/cpp/application_impl.h
|
| similarity index 90%
|
| rename from third_party/mojo/src/mojo/public/cpp/application/application_impl.h
|
| rename to mojo/application/public/cpp/application_impl.h
|
| index 294cfff41d035466d865f825529c80d865b2c2c4..a5d58f50f52dc5c18648cc207d5581cce6bd4f84 100644
|
| --- a/third_party/mojo/src/mojo/public/cpp/application/application_impl.h
|
| +++ b/mojo/application/public/cpp/application_impl.h
|
| @@ -2,16 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
|
| -#define MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
|
| +#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
|
| +#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
|
| +
|
| #include <vector>
|
|
|
| -#include "mojo/public/cpp/application/application_connection.h"
|
| -#include "mojo/public/cpp/application/application_delegate.h"
|
| -#include "mojo/public/cpp/application/lib/service_registry.h"
|
| +#include "mojo/application/public/cpp/application_connection.h"
|
| +#include "mojo/application/public/cpp/application_delegate.h"
|
| +#include "mojo/application/public/cpp/lib/service_registry.h"
|
| +#include "mojo/application/public/interfaces/application.mojom.h"
|
| +#include "mojo/application/public/interfaces/shell.mojom.h"
|
| #include "mojo/public/cpp/system/core.h"
|
| -#include "mojo/public/interfaces/application/application.mojom.h"
|
| -#include "mojo/public/interfaces/application/shell.mojom.h"
|
|
|
| namespace mojo {
|
|
|
| @@ -136,4 +137,4 @@ class ApplicationImpl : public Application {
|
|
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
|
| +#endif // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
|
|
|