diff options
| author | msw <msw@chromium.org> | 2015-05-28 11:27:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-28 18:28:18 +0000 |
| commit | 3d742d2793e5103d7d59bfd16e97a104a9d33482 (patch) | |
| tree | 410b6b9bcb210f207a0ce153f9f6abc178ba7a30 /mojo | |
| parent | c48fd0209655108ac33716ede56109724f839bc9 (diff) | |
| download | chromium_src-3d742d2793e5103d7d59bfd16e97a104a9d33482.zip chromium_src-3d742d2793e5103d7d59bfd16e97a104a9d33482.tar.gz chromium_src-3d742d2793e5103d7d59bfd16e97a104a9d33482.tar.bz2 | |
Use resolved URLs with NetworkFetcher in ApplicationManager.
Revert the resolved/requested URL behavior change from here:
https://codereview.chromium.org/1121783003/diff/320001/mojo/shell/application_manager.cc
android_mojo_shell.py hosts apps on a locally-served build dir.
This restores the ability to load those origin-mapped app URLs.
BUG=486220
TEST="mojo/tools/android_mojo_shell.py mojo:clipboard_apptests" works.
R=jam@chromium.org
Review URL: https://codereview.chromium.org/1156923003
Cr-Commit-Position: refs/heads/master@{#331824}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/shell/application_manager.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mojo/shell/application_manager.cc b/mojo/shell/application_manager.cc index bb07d70..3354fbd 100644 --- a/mojo/shell/application_manager.cc +++ b/mojo/shell/application_manager.cc @@ -188,6 +188,15 @@ void ApplicationManager::ConnectToApplicationInternal( ? NativeApplicationCleanup::DONT_DELETE : NativeApplicationCleanup::DELETE; + if (requested_gurl.SchemeIs("mojo")) { + // Use the resolved mojo URL in the request to support origin mapping, etc. + mojo::URLRequestPtr resolved_url_request(mojo::URLRequest::New()); + resolved_url_request->url = resolved_url.spec(); + new NetworkFetcher(disable_cache_, resolved_url_request.Pass(), + network_service_.get(), base::Bind(callback, cleanup)); + return; + } + new NetworkFetcher(disable_cache_, requested_url.Pass(), network_service_.get(), base::Bind(callback, cleanup)); } @@ -221,7 +230,7 @@ bool ApplicationManager::ConnectToApplicationWithLoader( return false; const GURL app_url = - requested_url.scheme() == "mojo" ? requested_url : resolved_url; + requested_url.SchemeIs("mojo") ? requested_url : resolved_url; loader->Load( resolved_url, |