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

Side by Side Diff: tools/gn/build_settings.cc

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/build_settings.h ('k') | tools/gn/builder.h » ('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 #include "tools/gn/build_settings.h" 5 #include "tools/gn/build_settings.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "tools/gn/filesystem_utils.h" 10 #include "tools/gn/filesystem_utils.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 base::FilePath BuildSettings::GetFullPathSecondary( 52 base::FilePath BuildSettings::GetFullPathSecondary(
53 const SourceFile& file) const { 53 const SourceFile& file) const {
54 return file.Resolve(secondary_source_path_).NormalizePathSeparatorsTo('/'); 54 return file.Resolve(secondary_source_path_).NormalizePathSeparatorsTo('/');
55 } 55 }
56 56
57 base::FilePath BuildSettings::GetFullPathSecondary( 57 base::FilePath BuildSettings::GetFullPathSecondary(
58 const SourceDir& dir) const { 58 const SourceDir& dir) const {
59 return dir.Resolve(secondary_source_path_).NormalizePathSeparatorsTo('/'); 59 return dir.Resolve(secondary_source_path_).NormalizePathSeparatorsTo('/');
60 } 60 }
61 61
62 void BuildSettings::ItemDefined(scoped_ptr<Item> item) const { 62 void BuildSettings::ItemDefined(std::unique_ptr<Item> item) const {
63 DCHECK(item); 63 DCHECK(item);
64 if (!item_defined_callback_.is_null()) 64 if (!item_defined_callback_.is_null())
65 item_defined_callback_.Run(std::move(item)); 65 item_defined_callback_.Run(std::move(item));
66 } 66 }
OLDNEW
« no previous file with comments | « tools/gn/build_settings.h ('k') | tools/gn/builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698