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

Unified Diff: third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc

Issue 1139123006: Fork the mojo shell interfaces used by Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 5 years, 7 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: third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc
diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc
deleted file mode 100644
index 731c562496e99141a8f271ddea90d1e22064fda3..0000000000000000000000000000000000000000
--- a/third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2014 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/public/cpp/application/application_impl.h"
-
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/lib/service_registry.h"
-#include "mojo/public/cpp/bindings/interface_ptr.h"
-#include "mojo/public/cpp/environment/logging.h"
-
-namespace mojo {
-
-class ApplicationImpl::ShellPtrWatcher : public ErrorHandler {
- public:
- ShellPtrWatcher(ApplicationImpl* impl) : impl_(impl) {}
-
- ~ShellPtrWatcher() override {}
-
- void OnConnectionError() override { impl_->OnShellError(); }
-
- private:
- ApplicationImpl* impl_;
- MOJO_DISALLOW_COPY_AND_ASSIGN(ShellPtrWatcher);
-};
-
-ApplicationImpl::ApplicationImpl(ApplicationDelegate* delegate,
- InterfaceRequest<Application> request)
- : delegate_(delegate),
- binding_(this, request.Pass()),
- shell_watch_(nullptr) {
-}
-
-bool ApplicationImpl::HasArg(const std::string& arg) const {
- return std::find(args_.begin(), args_.end(), arg) != args_.end();
-}
-
-void ApplicationImpl::ClearConnections() {
- for (ServiceRegistryList::iterator i(incoming_service_registries_.begin());
- i != incoming_service_registries_.end();
- ++i)
- delete *i;
- for (ServiceRegistryList::iterator i(outgoing_service_registries_.begin());
- i != outgoing_service_registries_.end();
- ++i)
- delete *i;
- incoming_service_registries_.clear();
- outgoing_service_registries_.clear();
-}
-
-ApplicationImpl::~ApplicationImpl() {
- ClearConnections();
- delete shell_watch_;
-}
-
-ApplicationConnection* ApplicationImpl::ConnectToApplication(
- const String& application_url) {
- MOJO_CHECK(shell_);
- ServiceProviderPtr local_services;
- InterfaceRequest<ServiceProvider> local_request = GetProxy(&local_services);
- ServiceProviderPtr remote_services;
- shell_->ConnectToApplication(application_url, GetProxy(&remote_services),
- local_services.Pass());
- internal::ServiceRegistry* registry = new internal::ServiceRegistry(
- this, application_url, application_url, remote_services.Pass(),
- local_request.Pass());
- if (!delegate_->ConfigureOutgoingConnection(registry)) {
- delete registry;
- return nullptr;
- }
- outgoing_service_registries_.push_back(registry);
- return registry;
-}
-
-void ApplicationImpl::Initialize(ShellPtr shell,
- Array<String> args,
- const mojo::String& url) {
- shell_ = shell.Pass();
- shell_watch_ = new ShellPtrWatcher(this);
- shell_.set_error_handler(shell_watch_);
- url_ = url;
- args_ = args.To<std::vector<std::string>>();
- delegate_->Initialize(this);
-}
-
-void ApplicationImpl::WaitForInitialize() {
- if (!shell_)
- binding_.WaitForIncomingMethodCall();
-}
-
-void ApplicationImpl::UnbindConnections(
- InterfaceRequest<Application>* application_request,
- ShellPtr* shell) {
- *application_request = binding_.Unbind();
- shell->Bind(shell_.PassInterface());
-}
-
-void ApplicationImpl::AcceptConnection(
- const String& requestor_url,
- InterfaceRequest<ServiceProvider> services,
- ServiceProviderPtr exposed_services,
- const String& url) {
- internal::ServiceRegistry* registry = new internal::ServiceRegistry(
- this, url, requestor_url, exposed_services.Pass(), services.Pass());
- if (!delegate_->ConfigureIncomingConnection(registry)) {
- delete registry;
- return;
- }
- incoming_service_registries_.push_back(registry);
-}
-
-void ApplicationImpl::RequestQuit() {
- delegate_->Quit();
- Terminate();
-}
-
-} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698