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

Unified Diff: mojo/runner/url_resolver.cc

Issue 1338283003: Revert of Move fetching logic out of ApplicationManager, eliminate url mappings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « mojo/runner/url_resolver.h ('k') | mojo/runner/url_resolver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/url_resolver.cc
diff --git a/mojo/runner/url_resolver.cc b/mojo/runner/url_resolver.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4222ec7cec3989a215c5bd4ca5d3e22d6c9f55e5
--- /dev/null
+++ b/mojo/runner/url_resolver.cc
@@ -0,0 +1,117 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "mojo/runner/url_resolver.h"
+
+#include "base/base_paths.h"
+#include "base/logging.h"
+#include "base/strings/utf_string_conversions.h"
+#include "mojo/runner/switches.h"
+#include "mojo/shell/query_util.h"
+#include "mojo/util/filename_util.h"
+#include "url/url_util.h"
+
+namespace mojo {
+namespace runner {
+
+URLResolver::URLResolver() {
+ // Needed to treat first component of mojo URLs as host, not path.
+ url::AddStandardScheme("mojo", url::SCHEME_WITHOUT_AUTHORITY);
+}
+
+URLResolver::~URLResolver() {
+}
+
+// static
+std::vector<URLResolver::OriginMapping> URLResolver::GetOriginMappings(
+ const base::CommandLine::StringVector& args) {
+ std::vector<OriginMapping> origin_mappings;
+ const std::string kArgsForSwitches[] = {
+ "-" + std::string(switches::kMapOrigin) + "=",
+ "--" + std::string(switches::kMapOrigin) + "=",
+ };
+ for (auto& arg : args) {
+ for (size_t i = 0; i < arraysize(kArgsForSwitches); i++) {
+ const std::string& argsfor_switch = kArgsForSwitches[i];
+ std::string arg_string;
+#if defined(OS_WIN)
+ arg_string = base::UTF16ToUTF8(arg);
+#else
+ arg_string = arg;
+#endif
+ if (arg_string.compare(0, argsfor_switch.size(), argsfor_switch) == 0) {
+ std::string value =
+ arg_string.substr(argsfor_switch.size(), std::string::npos);
+ size_t delim = value.find('=');
+ if (delim <= 0 || delim >= value.size())
+ continue;
+ origin_mappings.push_back(
+ OriginMapping(value.substr(0, delim),
+ value.substr(delim + 1, std::string::npos)));
+ }
+ }
+ }
+ return origin_mappings;
+}
+
+void URLResolver::AddURLMapping(const GURL& url, const GURL& mapped_url) {
+ url_map_[url] = mapped_url;
+}
+
+void URLResolver::AddOriginMapping(const GURL& origin, const GURL& base_url) {
+ if (!origin.is_valid() || !base_url.is_valid() ||
+ origin != origin.GetOrigin()) {
+ // Disallow invalid mappings.
+ LOG(ERROR) << "Invalid origin for mapping: " << origin;
+ return;
+ }
+ // Force both origin and base_url to have trailing slashes.
+ origin_map_[origin] = util::AddTrailingSlashIfNeeded(base_url);
+}
+
+GURL URLResolver::ApplyMappings(const GURL& url) const {
+ std::string query;
+ GURL mapped_url = shell::GetBaseURLAndQuery(url, &query);
+ for (;;) {
+ const auto& url_it = url_map_.find(mapped_url);
+ if (url_it != url_map_.end()) {
+ mapped_url = url_it->second;
+ continue;
+ }
+
+ GURL origin = mapped_url.GetOrigin();
+ const auto& origin_it = origin_map_.find(origin);
+ if (origin_it == origin_map_.end())
+ break;
+ mapped_url = GURL(origin_it->second.spec() +
+ mapped_url.spec().substr(origin.spec().length()));
+ }
+
+ if (query.length())
+ mapped_url = GURL(mapped_url.spec() + query);
+ return mapped_url;
+}
+
+void URLResolver::SetMojoBaseURL(const GURL& mojo_base_url) {
+ DCHECK(mojo_base_url.is_valid());
+ // Force a trailing slash on the base_url to simplify resolving
+ // relative files and URLs below.
+ mojo_base_url_ = util::AddTrailingSlashIfNeeded(mojo_base_url);
+}
+
+GURL URLResolver::ResolveMojoURL(const GURL& mojo_url) const {
+ if (mojo_url.scheme() != "mojo") {
+ // The mapping has produced some sort of non-mojo: URL - file:, http:, etc.
+ return mojo_url;
+ }
+
+ // It's still a mojo: URL, use the default mapping scheme.
+ std::string query;
+ GURL base_url = shell::GetBaseURLAndQuery(mojo_url, &query);
+ const std::string host = base_url.host();
+ return mojo_base_url_.Resolve(host + "/" + host + ".mojo" + query);
+}
+
+} // namespace runner
+} // namespace mojo
« no previous file with comments | « mojo/runner/url_resolver.h ('k') | mojo/runner/url_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698