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

Side by Side Diff: mojo/ui/view_provider_app.cc

Issue 1975253002: ApplicationConnection devolution, part 2.1. (Closed) Base URL: https://github.com/domokit/mojo.git@work792-x-work791_service_registry_spimpl
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
« no previous file with comments | « mojo/ui/view_provider_app.h ('k') | services/asset_bundle/main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/ui/view_provider_app.h" 5 #include "mojo/ui/view_provider_app.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 auto command_line = base::CommandLine::ForCurrentProcess(); 46 auto command_line = base::CommandLine::ForCurrentProcess();
47 command_line->InitFromArgv(app_impl_->args()); 47 command_line->InitFromArgv(app_impl_->args());
48 logging::LoggingSettings settings; 48 logging::LoggingSettings settings;
49 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; 49 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
50 logging::InitLogging(settings); 50 logging::InitLogging(settings);
51 } 51 }
52 52
53 bool ViewProviderApp::ConfigureIncomingConnection( 53 bool ViewProviderApp::ConfigureIncomingConnection(
54 mojo::ApplicationConnection* connection) { 54 mojo::ApplicationConnection* connection) {
55 connection->AddService<mojo::ui::ViewProvider>(this); 55 connection->GetServiceProviderImpl().AddService<ViewProvider>(
56 [this](const ConnectionContext& connection_context,
57 InterfaceRequest<ViewProvider> view_provider_request) {
58 bindings_.AddBinding(
59 new DelegatingViewProvider(this, connection_context.connection_url),
60 view_provider_request.Pass());
61 });
56 return true; 62 return true;
57 } 63 }
58 64
59 void ViewProviderApp::Create(
60 const mojo::ConnectionContext& connection_context,
61 mojo::InterfaceRequest<mojo::ui::ViewProvider> request) {
62 bindings_.AddBinding(
63 new DelegatingViewProvider(this, connection_context.connection_url),
64 request.Pass());
65 }
66
67 void ViewProviderApp::CreateView( 65 void ViewProviderApp::CreateView(
68 DelegatingViewProvider* provider, 66 DelegatingViewProvider* provider,
69 const std::string& view_provider_url, 67 const std::string& view_provider_url,
70 mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request, 68 mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
71 mojo::InterfaceRequest<mojo::ServiceProvider> services, 69 mojo::InterfaceRequest<mojo::ServiceProvider> services,
72 mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services) { 70 mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services) {
73 CreateView(view_provider_url, view_owner_request.Pass(), services.Pass(), 71 CreateView(view_provider_url, view_owner_request.Pass(), services.Pass(),
74 exposed_services.Pass()); 72 exposed_services.Pass());
75 } 73 }
76 74
77 } // namespace ui 75 } // namespace ui
78 } // namespace mojo 76 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/ui/view_provider_app.h ('k') | services/asset_bundle/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698