| 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 PlatformHandle(LongToHandle(client_handle_value))); | 82 PlatformHandle(LongToHandle(client_handle_value))); |
| 83 } | 83 } |
| 84 | 84 |
| 85 void PlatformChannelPair::PrepareToPassClientHandleToChildProcess( | 85 void PlatformChannelPair::PrepareToPassClientHandleToChildProcess( |
| 86 base::CommandLine* command_line, | 86 base::CommandLine* command_line, |
| 87 base::HandlesToInheritVector* handle_passing_info) const { | 87 base::HandlesToInheritVector* handle_passing_info) const { |
| 88 DCHECK(command_line); | 88 DCHECK(command_line); |
| 89 DCHECK(handle_passing_info); | 89 DCHECK(handle_passing_info); |
| 90 DCHECK(client_handle_.is_valid()); | 90 DCHECK(client_handle_.is_valid()); |
| 91 | 91 |
| 92 CHECK_GE(base::win::GetVersion(), base::win::VERSION_VISTA); | 92 if (base::win::GetVersion() >= base::win::VERSION_VISTA) |
| 93 | 93 handle_passing_info->push_back(client_handle_.get().handle); |
| 94 handle_passing_info->push_back(client_handle_.get().handle); | |
| 95 | 94 |
| 96 // Log a warning if the command line already has the switch, but "clobber" it | 95 // 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 | 96 // anyway, since it's reasonably likely that all the switches were just copied |
| 98 // from the parent. | 97 // from the parent. |
| 99 LOG_IF(WARNING, command_line->HasSwitch(kMojoPlatformChannelHandleSwitch)) | 98 LOG_IF(WARNING, command_line->HasSwitch(kMojoPlatformChannelHandleSwitch)) |
| 100 << "Child command line already has switch --" | 99 << "Child command line already has switch --" |
| 101 << kMojoPlatformChannelHandleSwitch << "=" | 100 << kMojoPlatformChannelHandleSwitch << "=" |
| 102 << command_line->GetSwitchValueASCII(kMojoPlatformChannelHandleSwitch); | 101 << command_line->GetSwitchValueASCII(kMojoPlatformChannelHandleSwitch); |
| 103 // (Any existing switch won't actually be removed from the command line, but | 102 // (Any existing switch won't actually be removed from the command line, but |
| 104 // the last one appended takes precedence.) | 103 // the last one appended takes precedence.) |
| 105 command_line->AppendSwitchASCII( | 104 command_line->AppendSwitchASCII( |
| 106 kMojoPlatformChannelHandleSwitch, | 105 kMojoPlatformChannelHandleSwitch, |
| 107 base::IntToString(HandleToLong(client_handle_.get().handle))); | 106 base::IntToString(HandleToLong(client_handle_.get().handle))); |
| 108 } | 107 } |
| 109 | 108 |
| 110 } // namespace edk | 109 } // namespace edk |
| 111 } // namespace mojo | 110 } // namespace mojo |
| OLD | NEW |