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

Unified Diff: mojo/runner/url_resolver.cc

Issue 1107233002: Move runner stuff into a runner namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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 | « 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
index 3b257f142167bccd03fab76d6e3d07b420f19ddf..e0ab27c260a2c75375686831b7eb1a3662016058 100644
--- a/mojo/runner/url_resolver.cc
+++ b/mojo/runner/url_resolver.cc
@@ -15,7 +15,7 @@
#include "url/url_util.h"
namespace mojo {
-namespace shell {
+namespace runner {
URLResolver::URLResolver() {
// Needed to treat first component of mojo URLs as host, not path.
@@ -74,7 +74,7 @@ void URLResolver::AddOriginMapping(const GURL& origin, const GURL& base_url) {
GURL URLResolver::ApplyMappings(const GURL& url) const {
std::string query;
- GURL mapped_url = GetBaseURLAndQuery(url, &query);
+ GURL mapped_url = shell::GetBaseURLAndQuery(url, &query);
for (;;) {
const auto& url_it = url_map_.find(mapped_url);
if (url_it != url_map_.end()) {
@@ -110,7 +110,7 @@ GURL URLResolver::ResolveMojoURL(const GURL& mojo_url) const {
// It's still a mojo: URL, use the default mapping scheme.
std::string query;
- GURL base_url = GetBaseURLAndQuery(mojo_url, &query);
+ GURL base_url = shell::GetBaseURLAndQuery(mojo_url, &query);
if (mojo_base_url_.SchemeIsFile()) {
const GURL url_with_directory(
mojo_base_url_.Resolve(base_url.host() + "/"));
@@ -121,5 +121,5 @@ GURL URLResolver::ResolveMojoURL(const GURL& mojo_url) const {
return mojo_base_url_.Resolve(base_url.host() + ".mojo" + query);
}
-} // namespace shell
+} // 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