diff options
| author | ben <ben@chromium.org> | 2015-09-17 19:46:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 02:47:10 +0000 |
| commit | 29dec844330333ee0aacb9beb5cfb58d7ba31d18 (patch) | |
| tree | 1fcc5b6da23548f3e59524cd9266c02c3d2190d1 /mojo/package_manager | |
| parent | 94d04853543125b5ff421696babb3bf74900a817 (diff) | |
| download | chromium_src-29dec844330333ee0aacb9beb5cfb58d7ba31d18.zip chromium_src-29dec844330333ee0aacb9beb5cfb58d7ba31d18.tar.gz chromium_src-29dec844330333ee0aacb9beb5cfb58d7ba31d18.tar.bz2 | |
Some more minor cleanup to ApplicationManager.
R=yzshen@chromium.org
http://crbug.com/533085
Committed: https://crrev.com/c6bde172a35b65b5a735675e840fab55921d28f8
Cr-Commit-Position: refs/heads/master@{#349515}
Review URL: https://codereview.chromium.org/1351963002
Cr-Commit-Position: refs/heads/master@{#349590}
Diffstat (limited to 'mojo/package_manager')
| -rw-r--r-- | mojo/package_manager/package_manager_impl.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mojo/package_manager/package_manager_impl.cc b/mojo/package_manager/package_manager_impl.cc index a2af6c1..8d8e19e 100644 --- a/mojo/package_manager/package_manager_impl.cc +++ b/mojo/package_manager/package_manager_impl.cc @@ -11,6 +11,7 @@ #include "mojo/fetcher/switches.h" #include "mojo/fetcher/update_fetcher.h" #include "mojo/shell/application_manager.h" +#include "mojo/shell/connect_util.h" #include "mojo/shell/query_util.h" #include "mojo/shell/switches.h" #include "mojo/util/filename_util.h" @@ -79,8 +80,8 @@ void PackageManagerImpl::FetchRequest( // LocalFetcher uses the network service to infer MIME types from URLs. // Skip this for mojo URLs to avoid recursively loading the network service. if (!network_service_ && !url.SchemeIs("mojo")) { - application_manager_->ConnectToService(GURL("mojo:network_service"), - &network_service_); + shell::ConnectToService(application_manager_, + GURL("mojo:network_service"), &network_service_); } // Ownership of this object is transferred to |loader_callback|. // TODO(beng): this is eff'n weird. @@ -99,7 +100,8 @@ void PackageManagerImpl::FetchRequest( if (url.SchemeIs("mojo") && base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kUseUpdater)) { - application_manager_->ConnectToService(GURL("mojo:updater"), &updater_); + shell::ConnectToService(application_manager_, GURL("mojo:updater"), + &updater_); // Ownership of this object is transferred to |loader_callback|. // TODO(beng): this is eff'n weird. new fetcher::UpdateFetcher(url, updater_.get(), loader_callback); @@ -108,8 +110,8 @@ void PackageManagerImpl::FetchRequest( #endif if (!url_loader_factory_) { - application_manager_->ConnectToService(GURL("mojo:network_service"), - &url_loader_factory_); + shell::ConnectToService(application_manager_, GURL("mojo:network_service"), + &url_loader_factory_); } // Ownership of this object is transferred to |loader_callback|. |