content/child/mojo/mojo_application.cc - Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 5 years, 1 month 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/background_sync/background_sync_type_converters.h ('k') | content/child/mojo/type_converters.h » ('j') | no next file with comments »

OLD	NEW
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 "content/child/child_process.h"	7 #include "content/child/child_process.h"

8 #include "content/common/application_setup.mojom.h"	8 #include "content/common/application_setup.mojom.h"

9 #include "content/common/mojo/channel_init.h"	9 #include "content/common/mojo/channel_init.h"

10 #include "content/common/mojo/mojo_messages.h"	10 #include "content/common/mojo/mojo_messages.h"

11 #include "ipc/ipc_message.h"	11 #include "ipc/ipc_message.h"

12 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h"	12 #include "mojo/public/cpp/bindings/interface_ptr.h"

13	13

14 namespace content {	14 namespace content {

15	15

16 MojoApplication::MojoApplication(	16 MojoApplication::MojoApplication(

17 scoped_refptr<base::SequencedTaskRunner> io_task_runner)	17 scoped_refptr<base::SequencedTaskRunner> io_task_runner)

18 : io_task_runner_(io_task_runner) {	18 : io_task_runner_(io_task_runner) {

19 DCHECK(io_task_runner_);	19 DCHECK(io_task_runner_);

20 }	20 }

21	21

22 MojoApplication::~MojoApplication() {	22 MojoApplication::~MojoApplication() {

(...skipping 26 matching lines...) Expand all Loading...
49	49

50 mojo::ServiceProviderPtr services;	50 mojo::ServiceProviderPtr services;

51 mojo::ServiceProviderPtr exposed_services;	51 mojo::ServiceProviderPtr exposed_services;

52 service_registry_.Bind(GetProxy(&exposed_services));	52 service_registry_.Bind(GetProxy(&exposed_services));

53 application_setup->ExchangeServiceProviders(GetProxy(&services),	53 application_setup->ExchangeServiceProviders(GetProxy(&services),

54 exposed_services.Pass());	54 exposed_services.Pass());

55 service_registry_.BindRemoteServiceProvider(services.Pass());	55 service_registry_.BindRemoteServiceProvider(services.Pass());

56 }	56 }

57	57

58 } // namespace content	58 } // namespace content

OLD	NEW