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

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

Issue 555503007: Cleanup: Get rid of OS_WIN/OS_POSIX ifdefs from MojoApplication (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated Created 6 years, 3 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 "content/child/child_process.h" 7 #include "content/child/child_process.h"
8 #include "content/common/mojo/mojo_messages.h" 8 #include "content/common/mojo/mojo_messages.h"
9 #include "ipc/ipc_message.h" 9 #include "ipc/ipc_message.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 MojoApplication::MojoApplication() { 13 MojoApplication::MojoApplication() {
14 } 14 }
15 15
16 MojoApplication::~MojoApplication() { 16 MojoApplication::~MojoApplication() {
17 } 17 }
18 18
19 bool MojoApplication::OnMessageReceived(const IPC::Message& msg) { 19 bool MojoApplication::OnMessageReceived(const IPC::Message& msg) {
20 bool handled = true; 20 bool handled = true;
21 IPC_BEGIN_MESSAGE_MAP(MojoApplication, msg) 21 IPC_BEGIN_MESSAGE_MAP(MojoApplication, msg)
22 IPC_MESSAGE_HANDLER(MojoMsg_Activate, OnActivate) 22 IPC_MESSAGE_HANDLER(MojoMsg_Activate, OnActivate)
23 IPC_MESSAGE_UNHANDLED(handled = false) 23 IPC_MESSAGE_UNHANDLED(handled = false)
24 IPC_END_MESSAGE_MAP() 24 IPC_END_MESSAGE_MAP()
25 return handled; 25 return handled;
26 } 26 }
27 27
28 void MojoApplication::OnActivate( 28 void MojoApplication::OnActivate(
29 const IPC::PlatformFileForTransit& file) { 29 const IPC::PlatformFileForTransit& file) {
30 #if defined(OS_POSIX) 30 base::PlatformFile handle = IPC::PlatformFileForTransitToPlatformFile(file);
31 base::PlatformFile handle = file.fd;
32 #elif defined(OS_WIN)
33 base::PlatformFile handle = file;
34 #endif
35 mojo::ScopedMessagePipeHandle message_pipe = 31 mojo::ScopedMessagePipeHandle message_pipe =
36 channel_init_.Init(handle, 32 channel_init_.Init(handle,
37 ChildProcess::current()->io_message_loop_proxy()); 33 ChildProcess::current()->io_message_loop_proxy());
38 DCHECK(message_pipe.is_valid()); 34 DCHECK(message_pipe.is_valid());
39 service_registry_.BindRemoteServiceProvider(message_pipe.Pass()); 35 service_registry_.BindRemoteServiceProvider(message_pipe.Pass());
40 } 36 }
41 37
42 } // namespace content 38 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698