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

Unified Diff: mash/common/config.cc

Issue 2710673002: Add Mojo constant for "ash" and replace hardcoded strings (Closed)
Patch Set: Fix dep of simple_wm constants and (for completeness) make mojo interfaces a dep of simple_wm; add … Created 3 years, 10 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 | « mash/common/BUILD.gn ('k') | mash/simple_wm/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/common/config.cc
diff --git a/mash/common/config.cc b/mash/common/config.cc
index f4e14f7809364732bcc8324771866f4fc8370ae5..afb9e890e696ecdfc58b8481ffe310856fc0b54c 100644
--- a/mash/common/config.cc
+++ b/mash/common/config.cc
@@ -4,6 +4,11 @@
#include "mash/common/config.h"
+#if defined(USE_ASH)
+#include "ash/public/interfaces/constants.mojom.h" // nogncheck
+#else
+#include "mash/simple_wm/public/interfaces/constants.mojom.h" // nogncheck
+#endif
#include "base/command_line.h"
namespace mash {
@@ -18,8 +23,11 @@ std::string GetWindowManagerServiceName() {
kWindowManagerSwitch);
return service_name;
}
- // TODO(beng): move this constant to a mojom file in //ash.
- return "ash";
+#if defined(USE_ASH)
+ return ash::mojom::kServiceName;
+#else
+ return mash::simple_wm::mojom::kServiceName;
tonikitoo 2017/02/21 14:29:46 I believe there is a slightly behavior change here
fwang 2017/02/21 14:34:20 Yes, it only makes sense to return "ash" when ash
fwang 2017/02/22 07:12:59 Done in patch set 3.
+#endif
}
} // namespace common
« no previous file with comments | « mash/common/BUILD.gn ('k') | mash/simple_wm/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698