| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/system/proxy_message_pipe_endpoint.h" | 5 #include "mojo/system/proxy_message_pipe_endpoint.h" |
| 6 | 6 |
| 7 #include <string.h> | 7 #include <string.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "mojo/system/channel_endpoint.h" | 10 #include "mojo/system/channel_endpoint.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 } | 101 } |
| 102 | 102 |
| 103 void ProxyMessagePipeEndpoint::OnRemove() { | 103 void ProxyMessagePipeEndpoint::OnRemove() { |
| 104 Detach(); | 104 Detach(); |
| 105 } | 105 } |
| 106 | 106 |
| 107 void ProxyMessagePipeEndpoint::Detach() { | 107 void ProxyMessagePipeEndpoint::Detach() { |
| 108 DCHECK(is_attached()); | 108 DCHECK(is_attached()); |
| 109 | 109 |
| 110 channel_endpoint_->DetachFromMessagePipe(); | 110 channel_endpoint_->DetachFromMessagePipe(); |
| 111 channel_endpoint_ = NULL; | 111 channel_endpoint_ = nullptr; |
| 112 is_running_ = false; | 112 is_running_ = false; |
| 113 paused_message_queue_.Clear(); | 113 paused_message_queue_.Clear(); |
| 114 } | 114 } |
| 115 | 115 |
| 116 } // namespace system | 116 } // namespace system |
| 117 } // namespace mojo | 117 } // namespace mojo |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 597413002:
Mojo: NULL -> nullptr in mojo/system and mojo/embedder. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master