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

Side by Side Diff: tools/gn/setup.h

Issue 1869503004: Convert //tools to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, change iwyu fixes for converted directories to include <memory> 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
« no previous file with comments | « tools/gn/scope_unittest.cc ('k') | tools/gn/setup.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef TOOLS_GN_SETUP_H_ 5 #ifndef TOOLS_GN_SETUP_H_
6 #define TOOLS_GN_SETUP_H_ 6 #define TOOLS_GN_SETUP_H_
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "tools/gn/build_settings.h" 13 #include "tools/gn/build_settings.h"
14 #include "tools/gn/builder.h" 14 #include "tools/gn/builder.h"
15 #include "tools/gn/label_pattern.h" 15 #include "tools/gn/label_pattern.h"
16 #include "tools/gn/loader.h" 16 #include "tools/gn/loader.h"
17 #include "tools/gn/scheduler.h" 17 #include "tools/gn/scheduler.h"
18 #include "tools/gn/scope.h" 18 #include "tools/gn/scope.h"
19 #include "tools/gn/settings.h" 19 #include "tools/gn/settings.h"
20 #include "tools/gn/token.h" 20 #include "tools/gn/token.h"
21 #include "tools/gn/toolchain.h" 21 #include "tools/gn/toolchain.h"
22 22
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 BuildSettings build_settings_; 129 BuildSettings build_settings_;
130 scoped_refptr<LoaderImpl> loader_; 130 scoped_refptr<LoaderImpl> loader_;
131 scoped_refptr<Builder> builder_; 131 scoped_refptr<Builder> builder_;
132 132
133 SourceFile root_build_file_; 133 SourceFile root_build_file_;
134 134
135 bool check_public_headers_; 135 bool check_public_headers_;
136 136
137 // See getter for info. 137 // See getter for info.
138 scoped_ptr<std::vector<LabelPattern>> check_patterns_; 138 std::unique_ptr<std::vector<LabelPattern>> check_patterns_;
139 139
140 Scheduler scheduler_; 140 Scheduler scheduler_;
141 141
142 // These settings and toolchain are used to interpret the command line and 142 // These settings and toolchain are used to interpret the command line and
143 // dot file. 143 // dot file.
144 Settings dotfile_settings_; 144 Settings dotfile_settings_;
145 Scope dotfile_scope_; 145 Scope dotfile_scope_;
146 146
147 // State for invoking the dotfile. 147 // State for invoking the dotfile.
148 base::FilePath dotfile_name_; 148 base::FilePath dotfile_name_;
149 scoped_ptr<InputFile> dotfile_input_file_; 149 std::unique_ptr<InputFile> dotfile_input_file_;
150 std::vector<Token> dotfile_tokens_; 150 std::vector<Token> dotfile_tokens_;
151 scoped_ptr<ParseNode> dotfile_root_; 151 std::unique_ptr<ParseNode> dotfile_root_;
152 152
153 // Set to true when we should populate the build arguments from the command 153 // Set to true when we should populate the build arguments from the command
154 // line or build argument file. See setter above. 154 // line or build argument file. See setter above.
155 bool fill_arguments_; 155 bool fill_arguments_;
156 156
157 // State for invoking the command line args. We specifically want to keep 157 // State for invoking the command line args. We specifically want to keep
158 // this around for the entire run so that Values can blame to the command 158 // this around for the entire run so that Values can blame to the command
159 // line when we issue errors about them. 159 // line when we issue errors about them.
160 scoped_ptr<InputFile> args_input_file_; 160 std::unique_ptr<InputFile> args_input_file_;
161 std::vector<Token> args_tokens_; 161 std::vector<Token> args_tokens_;
162 scoped_ptr<ParseNode> args_root_; 162 std::unique_ptr<ParseNode> args_root_;
163 163
164 DISALLOW_COPY_AND_ASSIGN(Setup); 164 DISALLOW_COPY_AND_ASSIGN(Setup);
165 }; 165 };
166 166
167 #endif // TOOLS_GN_SETUP_H_ 167 #endif // TOOLS_GN_SETUP_H_
OLDNEW
« no previous file with comments | « tools/gn/scope_unittest.cc ('k') | tools/gn/setup.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698