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

Side by Side Diff: mojo/edk/system/ipc_support.h

Issue 1350503005: EDK: Some more scoped_ptr -> std::unique_ptr conversions. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef MOJO_EDK_SYSTEM_IPC_SUPPORT_H_ 5 #ifndef MOJO_EDK_SYSTEM_IPC_SUPPORT_H_
6 #define MOJO_EDK_SYSTEM_IPC_SUPPORT_H_ 6 #define MOJO_EDK_SYSTEM_IPC_SUPPORT_H_
7 7
8 #include <memory>
9
8 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
9 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
10 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/task_runner.h" 13 #include "base/task_runner.h"
13 #include "mojo/edk/embedder/process_type.h" 14 #include "mojo/edk/embedder/process_type.h"
14 #include "mojo/edk/embedder/scoped_platform_handle.h" 15 #include "mojo/edk/embedder/scoped_platform_handle.h"
15 #include "mojo/edk/embedder/slave_info.h" 16 #include "mojo/edk/embedder/slave_info.h"
16 #include "mojo/edk/system/channel_id.h" 17 #include "mojo/edk/system/channel_id.h"
17 #include "mojo/edk/system/connection_identifier.h" 18 #include "mojo/edk/system/connection_identifier.h"
18 #include "mojo/edk/system/process_identifier.h" 19 #include "mojo/edk/system/process_identifier.h"
19 #include "mojo/edk/system/system_impl_export.h" 20 #include "mojo/edk/system/system_impl_export.h"
20 #include "mojo/public/cpp/system/macros.h" 21 #include "mojo/public/cpp/system/macros.h"
21 22
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 ConnectionManager* connection_manager() const { 163 ConnectionManager* connection_manager() const {
163 return connection_manager_.get(); 164 return connection_manager_.get();
164 } 165 }
165 166
166 // These are all set on construction and reset by |ShutdownOnIOThread()|. 167 // These are all set on construction and reset by |ShutdownOnIOThread()|.
167 embedder::ProcessType process_type_; 168 embedder::ProcessType process_type_;
168 scoped_refptr<base::TaskRunner> delegate_thread_task_runner_; 169 scoped_refptr<base::TaskRunner> delegate_thread_task_runner_;
169 embedder::ProcessDelegate* process_delegate_; 170 embedder::ProcessDelegate* process_delegate_;
170 scoped_refptr<base::TaskRunner> io_thread_task_runner_; 171 scoped_refptr<base::TaskRunner> io_thread_task_runner_;
171 172
172 scoped_ptr<ConnectionManager> connection_manager_; 173 std::unique_ptr<ConnectionManager> connection_manager_;
173 scoped_ptr<ChannelManager> channel_manager_; 174 std::unique_ptr<ChannelManager> channel_manager_;
174 175
175 MOJO_DISALLOW_COPY_AND_ASSIGN(IPCSupport); 176 MOJO_DISALLOW_COPY_AND_ASSIGN(IPCSupport);
176 }; 177 };
177 178
178 } // namespace system 179 } // namespace system
179 } // namespace mojo 180 } // namespace mojo
180 181
181 #endif // MOJO_EDK_SYSTEM_IPC_SUPPORT_H_ 182 #endif // MOJO_EDK_SYSTEM_IPC_SUPPORT_H_
OLDNEW
« no previous file with comments | « mojo/edk/system/data_pipe_impl_unittest.cc ('k') | mojo/edk/system/master_connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698