mojo/shell/mojo_url_resolver.cc - Issue 640403002: Drop refs to net::EmbeddedTestServer / net::File{Path,URL} utils in mojo

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/shell/mojo_url_resolver.cc

Issue 640403002: Drop refs to net::EmbeddedTestServer / net::File{Path,URL} utils in mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cast length explicitly Created 6 years, 2 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

Index: mojo/shell/mojo_url_resolver.cc

diff --git a/mojo/shell/mojo_url_resolver.cc b/mojo/shell/mojo_url_resolver.cc

index b7bc8433a856043a0ba657c94591e0d86e6a2f5a..8d37237d40e0c99f3c9915a607045505025ce470 100644

--- a/mojo/shell/mojo_url_resolver.cc

+++ b/mojo/shell/mojo_url_resolver.cc

@@ -9,7 +9,7 @@

#include "base/logging.h"

#include "base/path_service.h"

#include "base/strings/string_util.h"

-#include "net/base/filename_util.h"

+#include "mojo/shell/filename_util.h"

#include "url/url_util.h"

namespace mojo {

@@ -55,7 +55,7 @@ MojoURLResolver::MojoURLResolver() {

// By default, resolve mojo URLs to files living alongside the shell.

base::FilePath path;

PathService::Get(base::DIR_MODULE, &path);

- default_base_url_ = AddTrailingSlashIfNeeded(net::FilePathToFileURL(path));

+ default_base_url_ = AddTrailingSlashIfNeeded(FilePathToFileURL(path));

}

MojoURLResolver::~MojoURLResolver() {

« no previous file with comments | « mojo/shell/filename_util.cc ('k') | mojo/shell/shell_test_base.h » ('j') | no next file with comments »