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

Side by Side Diff: content/child/mojo/mojo_application.cc

Issue 1686223002: Move InterfaceProvider into the shell::mojom namespace like the rest of the shell interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 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 "content/child/mojo/mojo_application.h" 5 #include "content/child/mojo/mojo_application.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "content/child/child_process.h" 10 #include "content/child/child_process.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #endif 43 #endif
44 44
45 mojo::ScopedMessagePipeHandle pipe = 45 mojo::ScopedMessagePipeHandle pipe =
46 channel_init_.Init(handle, io_task_runner_); 46 channel_init_.Init(handle, io_task_runner_);
47 DCHECK(pipe.is_valid()); 47 DCHECK(pipe.is_valid());
48 48
49 ApplicationSetupPtr application_setup; 49 ApplicationSetupPtr application_setup;
50 application_setup.Bind( 50 application_setup.Bind(
51 mojo::InterfacePtrInfo<ApplicationSetup>(std::move(pipe), 0u)); 51 mojo::InterfacePtrInfo<ApplicationSetup>(std::move(pipe), 0u));
52 52
53 mojo::InterfaceProviderPtr services; 53 mojo::shell::mojom::InterfaceProviderPtr services;
54 mojo::InterfaceProviderPtr exposed_services; 54 mojo::shell::mojom::InterfaceProviderPtr exposed_services;
55 service_registry_.Bind(GetProxy(&exposed_services)); 55 service_registry_.Bind(GetProxy(&exposed_services));
56 application_setup->ExchangeInterfaceProviders(GetProxy(&services), 56 application_setup->ExchangeInterfaceProviders(GetProxy(&services),
57 std::move(exposed_services)); 57 std::move(exposed_services));
58 service_registry_.BindRemoteServiceProvider(std::move(services)); 58 service_registry_.BindRemoteServiceProvider(std::move(services));
59 } 59 }
60 60
61 } // namespace content 61 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/service_worker/embedded_worker_test_helper.cc ('k') | content/common/application_setup.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698