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 "mojo/edk/embedder/platform_channel_pair.h" | 5 #include "mojo/edk/embedder/platform_channel_pair.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 LOG(ERROR) << "Missing or invalid --" << kMojoPlatformChannelHandleSwitch; | 83 LOG(ERROR) << "Missing or invalid --" << kMojoPlatformChannelHandleSwitch; |
84 return ScopedPlatformHandle(); | 84 return ScopedPlatformHandle(); |
85 } | 85 } |
86 | 86 |
87 return ScopedPlatformHandle( | 87 return ScopedPlatformHandle( |
88 PlatformHandle(LongToHandle(client_handle_value))); | 88 PlatformHandle(LongToHandle(client_handle_value))); |
89 } | 89 } |
90 | 90 |
91 void PlatformChannelPair::PrepareToPassClientHandleToChildProcess( | 91 void PlatformChannelPair::PrepareToPassClientHandleToChildProcess( |
92 base::CommandLine* command_line, | 92 base::CommandLine* command_line, |
93 base::HandlesToInheritVector* handle_passing_info) const { | 93 std::vector<HANDLE>* handle_passing_info) const { |
94 DCHECK(command_line); | 94 DCHECK(command_line); |
95 | 95 |
96 // Log a warning if the command line already has the switch, but "clobber" it | 96 // Log a warning if the command line already has the switch, but "clobber" it |
97 // anyway, since it's reasonably likely that all the switches were just copied | 97 // anyway, since it's reasonably likely that all the switches were just copied |
98 // from the parent. | 98 // from the parent. |
99 LOG_IF(WARNING, command_line->HasSwitch(kMojoPlatformChannelHandleSwitch)) | 99 LOG_IF(WARNING, command_line->HasSwitch(kMojoPlatformChannelHandleSwitch)) |
100 << "Child command line already has switch --" | 100 << "Child command line already has switch --" |
101 << kMojoPlatformChannelHandleSwitch << "=" | 101 << kMojoPlatformChannelHandleSwitch << "=" |
102 << command_line->GetSwitchValueASCII(kMojoPlatformChannelHandleSwitch); | 102 << command_line->GetSwitchValueASCII(kMojoPlatformChannelHandleSwitch); |
103 // (Any existing switch won't actually be removed from the command line, but | 103 // (Any existing switch won't actually be removed from the command line, but |
(...skipping 10 matching lines...) Expand all Loading... |
114 DCHECK(client_handle_.is_valid()); | 114 DCHECK(client_handle_.is_valid()); |
115 | 115 |
116 if (base::win::GetVersion() >= base::win::VERSION_VISTA) | 116 if (base::win::GetVersion() >= base::win::VERSION_VISTA) |
117 handle_passing_info->push_back(client_handle_.get().handle); | 117 handle_passing_info->push_back(client_handle_.get().handle); |
118 | 118 |
119 return base::IntToString(HandleToLong(client_handle_.get().handle)); | 119 return base::IntToString(HandleToLong(client_handle_.get().handle)); |
120 } | 120 } |
121 | 121 |
122 } // namespace edk | 122 } // namespace edk |
123 } // namespace mojo | 123 } // namespace mojo |
OLD | NEW |