content/browser/mojo/mojo_application_host.cc - Issue 623883002: Revert "Move mojo edk into mojo/edk"

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/browser/mojo/mojo_application_host.cc

Issue 623883002: Revert "Move mojo edk into mojo/edk" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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/browser/mojo/mojo_application_host.h ('k') | content/browser/webui/web_ui_mojo_browsertest.cc » ('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/browser/mojo/mojo_application_host.h"	5 #include "content/browser/mojo/mojo_application_host.h"

6	6

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

8 #include "content/public/browser/browser_thread.h"	8 #include "content/public/browser/browser_thread.h"

9 #include "ipc/ipc_sender.h"	9 #include "ipc/ipc_sender.h"

10 #include "mojo/edk/embedder/platform_channel_pair.h"	10 #include "mojo/embedder/platform_channel_pair.h"

11	11

12 namespace content {	12 namespace content {

13 namespace {	13 namespace {

14	14

15 base::PlatformFile PlatformFileFromScopedPlatformHandle(	15 base::PlatformFile PlatformFileFromScopedPlatformHandle(

16 mojo::embedder::ScopedPlatformHandle handle) {	16 mojo::embedder::ScopedPlatformHandle handle) {

17 #if defined(OS_POSIX)	17 #if defined(OS_POSIX)

18 return handle.release().fd;	18 return handle.release().fd;

19 #elif defined(OS_WIN)	19 #elif defined(OS_WIN)

20 return handle.release().handle;	20 return handle.release().handle;

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 did_activate_ = sender->Send(new MojoMsg_Activate(	57 did_activate_ = sender->Send(new MojoMsg_Activate(

58 IPC::GetFileHandleForProcess(client_file, process_handle, true)));	58 IPC::GetFileHandleForProcess(client_file, process_handle, true)));

59 return did_activate_;	59 return did_activate_;

60 }	60 }

61	61

62 void MojoApplicationHost::WillDestroySoon() {	62 void MojoApplicationHost::WillDestroySoon() {

63 channel_init_.WillDestroySoon();	63 channel_init_.WillDestroySoon();

64 }	64 }

65	65

66 } // namespace content	66 } // namespace content

OLD	NEW