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

Unified Diff: mojo/package_manager/package_manager_impl.cc

Issue 1350023002: Revert of Extract some stuff into PackageManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/package_manager/package_manager_impl.h ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/package_manager/package_manager_impl.cc
diff --git a/mojo/package_manager/package_manager_impl.cc b/mojo/package_manager/package_manager_impl.cc
deleted file mode 100644
index f1a1fc6bfb7be73f21c404c02923cc44b3d572c4..0000000000000000000000000000000000000000
--- a/mojo/package_manager/package_manager_impl.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "mojo/package_manager/package_manager_impl.h"
-
-#include "mojo/fetcher/about_fetcher.h"
-#include "mojo/fetcher/local_fetcher.h"
-#include "mojo/fetcher/network_fetcher.h"
-#include "mojo/fetcher/switches.h"
-#include "mojo/fetcher/update_fetcher.h"
-#include "mojo/shell/application_manager.h"
-#include "mojo/shell/query_util.h"
-#include "mojo/shell/switches.h"
-#include "mojo/util/filename_util.h"
-#include "url/gurl.h"
-
-namespace mojo {
-namespace package_manager {
-
-PackageManagerImpl::PackageManagerImpl(
- const base::FilePath& shell_file_root)
- : application_manager_(nullptr),
- disable_cache_(base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableCache)) {
- if (!shell_file_root.empty()) {
- GURL mojo_root_file_url =
- util::FilePathToFileURL(shell_file_root).Resolve(std::string());
- url_resolver_.reset(new fetcher::URLResolver(mojo_root_file_url));
- }
-}
-
-PackageManagerImpl::~PackageManagerImpl() {
-}
-
-void PackageManagerImpl::RegisterContentHandler(
- const std::string& mime_type,
- const GURL& content_handler_url) {
- DCHECK(content_handler_url.is_valid())
- << "Content handler URL is invalid for mime type " << mime_type;
- mime_type_to_url_[mime_type] = content_handler_url;
-}
-
-void PackageManagerImpl::RegisterApplicationPackageAlias(
- const GURL& alias,
- const GURL& content_handler_package,
- const std::string& qualifier) {
- application_package_alias_[alias] =
- std::make_pair(content_handler_package, qualifier);
-}
-
-void PackageManagerImpl::SetApplicationManager(
- shell::ApplicationManager* manager) {
- application_manager_ = manager;
-}
-
-GURL PackageManagerImpl::ResolveURL(const GURL& url) {
- return url_resolver_.get() ? url_resolver_->ResolveMojoURL(url) : url;
-}
-
-void PackageManagerImpl::FetchRequest(
- URLRequestPtr request,
- const shell::Fetcher::FetchCallback& loader_callback) {
- GURL url(request->url);
- if (url.SchemeIs(fetcher::AboutFetcher::kAboutScheme)) {
- fetcher::AboutFetcher::Start(url, loader_callback);
- return;
- }
-
- GURL resolved_url = ResolveURL(url);
-
- if (resolved_url.SchemeIsFile()) {
- // 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_);
- }
- // Ownership of this object is transferred to |loader_callback|.
- // TODO(beng): this is eff'n weird.
- new fetcher::LocalFetcher(
- network_service_.get(), resolved_url,
- shell::GetBaseURLAndQuery(resolved_url, nullptr),
- loader_callback);
- return;
- }
-
-#if 0
- // TODO(beng): figure out how this should be integrated now that mapped_url
- // is toast.
- // TODO(scottmg): to quote someone I know, if you liked this you shouldda put
- // a test on it.
- if (url.SchemeIs("mojo") &&
- base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kUseUpdater)) {
- application_manager_->ConnectToService(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);
- return;
- }
-#endif
-
- if (!url_loader_factory_) {
- application_manager_->ConnectToService(GURL("mojo:network_service"),
- &url_loader_factory_);
- }
-
- // Ownership of this object is transferred to |loader_callback|.
- // TODO(beng): this is eff'n weird.
- new fetcher::NetworkFetcher(disable_cache_, request.Pass(),
- url_loader_factory_.get(), loader_callback);
-}
-
-bool PackageManagerImpl::HandleWithContentHandler(shell::Fetcher* fetcher,
- const GURL& unresolved_url,
- base::TaskRunner* task_runner,
- URLResponsePtr* new_response,
- GURL* content_handler_url,
- std::string* qualifier) {
- // TODO(beng): it seems like some delegate should/would want to have a say in
- // configuring the qualifier also.
- bool enable_multi_process = base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableMultiprocess);
-
- // The response begins with a #!mojo <content-handler-url>.
- std::string shebang;
- if (fetcher->PeekContentHandler(&shebang, content_handler_url)) {
- *new_response = fetcher->AsURLResponse(
- task_runner, static_cast<int>(shebang.size()));
- *qualifier = enable_multi_process ? (*new_response)->site.To<std::string>()
- : std::string();
- return true;
- }
-
- // The response MIME type matches a registered content handler.
- MimeTypeToURLMap::iterator iter = mime_type_to_url_.find(fetcher->MimeType());
- if (iter != mime_type_to_url_.end()) {
- *new_response = fetcher->AsURLResponse(task_runner, 0);
- *content_handler_url = iter->second;
- *qualifier = enable_multi_process ? (*new_response)->site.To<std::string>()
- : std::string();
- return true;
- }
-
- // The response URL matches a registered content handler.
- auto alias_iter = application_package_alias_.find(unresolved_url);
- if (alias_iter != application_package_alias_.end()) {
- // We replace the qualifier with the one our package alias requested.
- *new_response = URLResponse::New();
- (*new_response)->url = unresolved_url.spec();
-
- // Why can't we use this in single process mode? Because of
- // base::AtExitManager. If you link in ApplicationRunner into your code, and
- // then we make initialize multiple copies of the application, we end up
- // with multiple AtExitManagers and will check on the second one being
- // created.
- //
- // Why doesn't that happen when running different apps? Because
- // your_thing.mojo!base::AtExitManager and
- // my_thing.mojo!base::AtExitManager are different symbols.
- *qualifier = enable_multi_process ? alias_iter->second.second
- : std::string();
- *content_handler_url = alias_iter->second.first;
- return true;
- }
-
- return false;
-}
-
-} // namespace package_manager
-} // namespace mojo
« no previous file with comments | « mojo/package_manager/package_manager_impl.h ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698