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

Unified Diff: mojo/shell/mojo_url_resolver.cc

Issue 713513002: Change mojo application name to {name}.mojo (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Add missing library. Created 6 years, 1 month 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 | « mojo/services/window_manager/BUILD.gn ('k') | mojo/tools/package_manager/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/mojo_url_resolver.cc
diff --git a/mojo/shell/mojo_url_resolver.cc b/mojo/shell/mojo_url_resolver.cc
index beaa8d8546ab80b5d43b4f819dff9f73c1258370..883f5e47644242f22dcd11b00822587278dc3767 100644
--- a/mojo/shell/mojo_url_resolver.cc
+++ b/mojo/shell/mojo_url_resolver.cc
@@ -15,19 +15,6 @@ namespace mojo {
namespace shell {
namespace {
-std::string MakeSharedLibraryName(const std::string& host_name) {
-#if defined(OS_WIN)
- return host_name + ".dll";
-#elif defined(OS_LINUX) || defined(OS_ANDROID)
- return "lib" + host_name + ".so";
-#elif defined(OS_MACOSX)
- return host_name + ".so";
-#else
- NOTREACHED() << "dynamic loading of services not supported";
- return std::string();
-#endif
-}
-
GURL AddTrailingSlashIfNeeded(const GURL& url) {
if (!url.has_path() || *url.path().rbegin() == '/')
return url;
@@ -76,7 +63,7 @@ GURL MojoURLResolver::Resolve(const GURL& mojo_url) const {
if (mapped_url.scheme() != "mojo")
return mapped_url;
- std::string lib = MakeSharedLibraryName(mapped_url.host());
+ std::string lib = mapped_url.host() + ".mojo";
if (!base_url_.is_valid() ||
local_file_set_.find(mapped_url) != local_file_set_.end()) {
« no previous file with comments | « mojo/services/window_manager/BUILD.gn ('k') | mojo/tools/package_manager/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698