Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: mojo/application/public/cpp/lib/service_registry.h

Issue 1139123006: Fork the mojo shell interfaces used by Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/application/public/cpp/lib/service_registry.h
diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h b/mojo/application/public/cpp/lib/service_registry.h
similarity index 84%
rename from third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h
rename to mojo/application/public/cpp/lib/service_registry.h
index b303911d8941e5609b46768a8ac7d77554cde578..9eee695f3e06c06c00d723050929c6d55c6470d7 100644
--- a/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h
+++ b/mojo/application/public/cpp/lib/service_registry.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_REGISTRY_H_
-#define MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_REGISTRY_H_
+#ifndef MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
+#define MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
#include <string>
-#include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/public/cpp/application/lib/service_connector_registry.h"
-#include "mojo/public/interfaces/application/service_provider.mojom.h"
+#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/application/public/cpp/lib/service_connector_registry.h"
+#include "mojo/application/public/interfaces/service_provider.mojom.h"
namespace mojo {
@@ -64,4 +64,4 @@ class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
} // namespace internal
} // namespace mojo
-#endif // MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_REGISTRY_H_
+#endif // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_

Powered by Google App Engine
This is Rietveld 408576698