Mojo: Make mojo_shell able to load apps from file: URLs.

E.g., something like

  out/Debug/mojo_shell file://$PWD/out/Debug/lib/libmojo_sample_app.so

should work.

R=sky@chromium.org

Review URL: https://codereview.chromium.org/302173003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274317 0039d316-1c4b-4281-b951-d872f2087c98
parent b0bcc0b4
...@@ -34,16 +34,21 @@ void Loader::Job::OnURLFetchComplete(const net::URLFetcher* source) { ...@@ -34,16 +34,21 @@ void Loader::Job::OnURLFetchComplete(const net::URLFetcher* source) {
LOG(ERROR) << "URL fetch didn't succeed: status = " << status.status() LOG(ERROR) << "URL fetch didn't succeed: status = " << status.status()
<< ", error = " << status.error(); << ", error = " << status.error();
} else if (source->GetResponseCode() != 200) { } else if (source->GetResponseCode() != 200) {
LOG(ERROR) << "HTTP response not OK: code = " << source->GetResponseCode(); // Note: We may not have a response code (e.g., if it wasn't an http: URL).
LOG(WARNING) << "HTTP response not OK: code = "
<< source->GetResponseCode();
} }
// TODO: Do something else in the error cases? // TODO: Do something else in the error cases?
base::FilePath app_path; base::FilePath app_path;
source->GetResponseAsFilePath(true, &app_path); source->GetResponseAsFilePath(true, &app_path);
std::string mime_type; std::string mime_type;
std::string* passed_mime_type = // We may not have response headers (e.g., if it was a file: URL).
source->GetResponseHeaders()->GetMimeType(&mime_type) ? &mime_type : NULL; if (source->GetResponseHeaders())
delegate_->DidCompleteLoad(source->GetURL(), app_path, passed_mime_type); source->GetResponseHeaders()->GetMimeType(&mime_type);
delegate_->DidCompleteLoad(source->GetURL(),
app_path,
mime_type.empty() ? NULL : &mime_type);
} }
Loader::Loader(base::SingleThreadTaskRunner* network_runner, Loader::Loader(base::SingleThreadTaskRunner* network_runner,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment