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

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

Issue 19579005: Move ReadFileToString to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « tools/gn/command_gyp.cc ('k') | tools/gn/input_file.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 #include "base/file_util.h" 5 #include "base/file_util.h"
6 #include "tools/gn/err.h" 6 #include "tools/gn/err.h"
7 #include "tools/gn/filesystem_utils.h" 7 #include "tools/gn/filesystem_utils.h"
8 #include "tools/gn/functions.h" 8 #include "tools/gn/functions.h"
9 #include "tools/gn/input_conversion.h" 9 #include "tools/gn/input_conversion.h"
10 #include "tools/gn/input_file.h" 10 #include "tools/gn/input_file.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 const SourceDir& cur_dir = scope->GetSourceDir(); 53 const SourceDir& cur_dir = scope->GetSourceDir();
54 SourceFile source_file = cur_dir.ResolveRelativeFile(args[0].string_value()); 54 SourceFile source_file = cur_dir.ResolveRelativeFile(args[0].string_value());
55 base::FilePath file_path = 55 base::FilePath file_path =
56 scope->settings()->build_settings()->GetFullPath(source_file); 56 scope->settings()->build_settings()->GetFullPath(source_file);
57 57
58 // Ensure that everything is recomputed if the read file changes. 58 // Ensure that everything is recomputed if the read file changes.
59 g_scheduler->AddGenDependency(file_path); 59 g_scheduler->AddGenDependency(file_path);
60 60
61 // Read contents. 61 // Read contents.
62 std::string file_contents; 62 std::string file_contents;
63 if (!file_util::ReadFileToString(file_path, &file_contents)) { 63 if (!base::ReadFileToString(file_path, &file_contents)) {
64 *err = Err(args[0], "Could not read file.", 64 *err = Err(args[0], "Could not read file.",
65 "I resolved this to \"" + FilePathToUTF8(file_path) + "\"."); 65 "I resolved this to \"" + FilePathToUTF8(file_path) + "\".");
66 return Value(); 66 return Value();
67 } 67 }
68 68
69 return ConvertInputToValue(file_contents, function, args[1], err); 69 return ConvertInputToValue(file_contents, function, args[1], err);
70 } 70 }
71 71
72 } // namespace functions 72 } // namespace functions
OLDNEW
« no previous file with comments | « tools/gn/command_gyp.cc ('k') | tools/gn/input_file.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698