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

Side by Side Diff: mojo/public/cpp/application/lib/application_impl.cc

Issue 1964623002: Make the Dart application library code stop using the "wrong way" service provider (a.k.a. exposed_… (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/public/cpp/application/application_impl.h" 5 #include "mojo/public/cpp/application/application_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "mojo/public/cpp/application/application_delegate.h" 9 #include "mojo/public/cpp/application/application_delegate.h"
10 #include "mojo/public/cpp/application/lib/service_registry.h" 10 #include "mojo/public/cpp/application/lib/service_registry.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 url_ = url; 57 url_ = url;
58 args_ = args.To<std::vector<std::string>>(); 58 args_ = args.To<std::vector<std::string>>();
59 delegate_->Initialize(this); 59 delegate_->Initialize(this);
60 } 60 }
61 61
62 void ApplicationImpl::AcceptConnection( 62 void ApplicationImpl::AcceptConnection(
63 const String& requestor_url, 63 const String& requestor_url,
64 InterfaceRequest<ServiceProvider> services, 64 InterfaceRequest<ServiceProvider> services,
65 InterfaceHandle<ServiceProvider> exposed_services, 65 InterfaceHandle<ServiceProvider> exposed_services,
66 const String& url) { 66 const String& url) {
67 MOJO_LOG_IF(WARNING, exposed_services)
68 << "DEPRECATION WARNING: exposed_services will soon go away";
67 std::unique_ptr<internal::ServiceRegistry> registry( 69 std::unique_ptr<internal::ServiceRegistry> registry(
68 new internal::ServiceRegistry(this, url, requestor_url, 70 new internal::ServiceRegistry(this, url, requestor_url,
69 std::move(exposed_services), 71 std::move(exposed_services),
70 services.Pass())); 72 services.Pass()));
71 if (!delegate_->ConfigureIncomingConnection(registry.get())) 73 if (!delegate_->ConfigureIncomingConnection(registry.get()))
72 return; 74 return;
73 incoming_service_registries_.push_back(std::move(registry)); 75 incoming_service_registries_.push_back(std::move(registry));
74 } 76 }
75 77
76 void ApplicationImpl::RequestQuit() { 78 void ApplicationImpl::RequestQuit() {
77 delegate_->Quit(); 79 delegate_->Quit();
78 Terminate(); 80 Terminate();
79 } 81 }
80 82
81 } // namespace mojo 83 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698