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

Unified Diff: services/shell/public/cpp/identity.h

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
« no previous file with comments | « services/shell/public/cpp/connector.h ('k') | services/shell/public/cpp/initialize_base_and_icu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/public/cpp/identity.h
diff --git a/services/shell/public/cpp/identity.h b/services/shell/public/cpp/identity.h
index 01d0913cc80974c3e2380b9a9d7f5f3419a2b915..3c2cb0b1cb53ba5e0b6a0fb7d91267f6dee11caf 100644
--- a/services/shell/public/cpp/identity.h
+++ b/services/shell/public/cpp/identity.h
@@ -9,7 +9,7 @@
#include "services/shell/public/interfaces/connector.mojom.h"
-namespace mojo {
+namespace shell {
// Represents the identity of an application.
// |name| is the structured name of the application.
@@ -41,13 +41,18 @@ class Identity {
std::string instance_;
};
+} // namespace shell
+
+namespace mojo {
+
template <>
-struct TypeConverter<shell::mojom::IdentityPtr, Identity> {
- static shell::mojom::IdentityPtr Convert(const Identity& input);
+struct TypeConverter<shell::mojom::IdentityPtr, shell::Identity> {
+ static shell::mojom::IdentityPtr Convert(const shell::Identity& input);
};
+
template <>
-struct TypeConverter<Identity, shell::mojom::IdentityPtr> {
- static Identity Convert(const shell::mojom::IdentityPtr& input);
+struct TypeConverter<shell::Identity, shell::mojom::IdentityPtr> {
+ static shell::Identity Convert(const shell::mojom::IdentityPtr& input);
};
} // namespace mojo
« no previous file with comments | « services/shell/public/cpp/connector.h ('k') | services/shell/public/cpp/initialize_base_and_icu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698