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

Side by Side Diff: content/browser/utility_process_host_impl.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_
6 #define CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
12 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "content/public/browser/browser_child_process_host_delegate.h" 18 #include "content/public/browser/browser_child_process_host_delegate.h"
19 #include "content/public/browser/utility_process_host.h" 19 #include "content/public/browser/utility_process_host.h"
20 20
21 namespace base { 21 namespace base {
22 class SequencedTaskRunner; 22 class SequencedTaskRunner;
23 class Thread; 23 class Thread;
24 } 24 }
25 25
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 int child_flags_; 98 int child_flags_;
99 99
100 base::EnvironmentMap env_; 100 base::EnvironmentMap env_;
101 101
102 bool started_; 102 bool started_;
103 103
104 // A user-visible name identifying this process. Used to indentify this 104 // A user-visible name identifying this process. Used to indentify this
105 // process in the task manager. 105 // process in the task manager.
106 base::string16 name_; 106 base::string16 name_;
107 107
108 scoped_ptr<BrowserChildProcessHostImpl> process_; 108 std::unique_ptr<BrowserChildProcessHostImpl> process_;
109 109
110 // Used in single-process mode instead of process_. 110 // Used in single-process mode instead of process_.
111 scoped_ptr<base::Thread> in_process_thread_; 111 std::unique_ptr<base::Thread> in_process_thread_;
112 112
113 // Browser-side Mojo endpoint which sets up a Mojo channel with the child 113 // Browser-side Mojo endpoint which sets up a Mojo channel with the child
114 // process and contains the browser's ServiceRegistry. 114 // process and contains the browser's ServiceRegistry.
115 scoped_ptr<MojoApplicationHost> mojo_application_host_; 115 std::unique_ptr<MojoApplicationHost> mojo_application_host_;
116 116
117 // Used to vend weak pointers, and should always be declared last. 117 // Used to vend weak pointers, and should always be declared last.
118 base::WeakPtrFactory<UtilityProcessHostImpl> weak_ptr_factory_; 118 base::WeakPtrFactory<UtilityProcessHostImpl> weak_ptr_factory_;
119 119
120 DISALLOW_COPY_AND_ASSIGN(UtilityProcessHostImpl); 120 DISALLOW_COPY_AND_ASSIGN(UtilityProcessHostImpl);
121 }; 121 };
122 122
123 } // namespace content 123 } // namespace content
124 124
125 #endif // CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_ 125 #endif // CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/tracing/tracing_ui.cc ('k') | content/browser/vr/android/cardboard/cardboard_vr_device_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698