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

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

Issue 1544293002: Convert Pass()→std::move() in //content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | « content/child/child_thread_impl_browsertest.cc ('k') | content/child/mojo/type_converters.h » ('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 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>
8
7 #include "build/build_config.h" 9 #include "build/build_config.h"
8 #include "content/child/child_process.h" 10 #include "content/child/child_process.h"
9 #include "content/common/application_setup.mojom.h" 11 #include "content/common/application_setup.mojom.h"
10 #include "content/common/mojo/channel_init.h" 12 #include "content/common/mojo/channel_init.h"
11 #include "content/common/mojo/mojo_messages.h" 13 #include "content/common/mojo/mojo_messages.h"
12 #include "ipc/ipc_message.h" 14 #include "ipc/ipc_message.h"
13 #include "mojo/public/cpp/bindings/interface_ptr.h" 15 #include "mojo/public/cpp/bindings/interface_ptr.h"
14 16
15 namespace content { 17 namespace content {
16 18
(...skipping 22 matching lines...) Expand all
39 #elif defined(OS_WIN) 41 #elif defined(OS_WIN)
40 base::PlatformFile handle = file; 42 base::PlatformFile handle = file;
41 #endif 43 #endif
42 44
43 mojo::ScopedMessagePipeHandle message_pipe = 45 mojo::ScopedMessagePipeHandle message_pipe =
44 channel_init_.Init(handle, io_task_runner_); 46 channel_init_.Init(handle, io_task_runner_);
45 DCHECK(message_pipe.is_valid()); 47 DCHECK(message_pipe.is_valid());
46 48
47 ApplicationSetupPtr application_setup; 49 ApplicationSetupPtr application_setup;
48 application_setup.Bind( 50 application_setup.Bind(
49 mojo::InterfacePtrInfo<ApplicationSetup>(message_pipe.Pass(), 0u)); 51 mojo::InterfacePtrInfo<ApplicationSetup>(std::move(message_pipe), 0u));
50 52
51 mojo::ServiceProviderPtr services; 53 mojo::ServiceProviderPtr services;
52 mojo::ServiceProviderPtr exposed_services; 54 mojo::ServiceProviderPtr exposed_services;
53 service_registry_.Bind(GetProxy(&exposed_services)); 55 service_registry_.Bind(GetProxy(&exposed_services));
54 application_setup->ExchangeServiceProviders(GetProxy(&services), 56 application_setup->ExchangeServiceProviders(GetProxy(&services),
55 exposed_services.Pass()); 57 std::move(exposed_services));
56 service_registry_.BindRemoteServiceProvider(services.Pass()); 58 service_registry_.BindRemoteServiceProvider(std::move(services));
57 } 59 }
58 60
59 } // namespace content 61 } // namespace content
OLDNEW
« no previous file with comments | « content/child/child_thread_impl_browsertest.cc ('k') | content/child/mojo/type_converters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698