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

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

Issue 183853011: Move TrimWhitespace to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « third_party/leveldatabase/env_chromium_win.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 #include "tools/gn/input_conversion.h" 5 #include "tools/gn/input_conversion.h"
6 6
7 #include "base/strings/string_split.h" 7 #include "base/strings/string_split.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "tools/gn/build_settings.h" 9 #include "tools/gn/build_settings.h"
10 #include "tools/gn/err.h" 10 #include "tools/gn/err.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 const ParseNode* origin, 125 const ParseNode* origin,
126 const Value& original_input_conversion, 126 const Value& original_input_conversion,
127 const std::string& input_conversion, 127 const std::string& input_conversion,
128 Err* err) { 128 Err* err) {
129 if (input_conversion.empty()) 129 if (input_conversion.empty())
130 return Value(); // Empty string means discard the result. 130 return Value(); // Empty string means discard the result.
131 131
132 const char kTrimPrefix[] = "trim "; 132 const char kTrimPrefix[] = "trim ";
133 if (StartsWithASCII(input_conversion, kTrimPrefix, true)) { 133 if (StartsWithASCII(input_conversion, kTrimPrefix, true)) {
134 std::string trimmed; 134 std::string trimmed;
135 TrimWhitespaceASCII(input, TRIM_ALL, &trimmed); 135 base::TrimWhitespaceASCII(input, base::TRIM_ALL, &trimmed);
136 136
137 // Remove "trim" prefix from the input conversion and re-run. 137 // Remove "trim" prefix from the input conversion and re-run.
138 return DoConvertInputToValue( 138 return DoConvertInputToValue(
139 trimmed, origin, original_input_conversion, 139 trimmed, origin, original_input_conversion,
140 input_conversion.substr(arraysize(kTrimPrefix) - 1), err); 140 input_conversion.substr(arraysize(kTrimPrefix) - 1), err);
141 } 141 }
142 142
143 if (input_conversion == "value") 143 if (input_conversion == "value")
144 return ParseString(input, origin, err); 144 return ParseString(input, origin, err);
145 if (input_conversion == "string") 145 if (input_conversion == "string")
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 const ParseNode* origin, 201 const ParseNode* origin,
202 const Value& input_conversion_value, 202 const Value& input_conversion_value,
203 Err* err) { 203 Err* err) {
204 if (input_conversion_value.type() == Value::NONE) 204 if (input_conversion_value.type() == Value::NONE)
205 return Value(); // Allow null inputs to mean discard the result. 205 return Value(); // Allow null inputs to mean discard the result.
206 if (!input_conversion_value.VerifyTypeIs(Value::STRING, err)) 206 if (!input_conversion_value.VerifyTypeIs(Value::STRING, err))
207 return Value(); 207 return Value();
208 return DoConvertInputToValue(input, origin, input_conversion_value, 208 return DoConvertInputToValue(input, origin, input_conversion_value,
209 input_conversion_value.string_value(), err); 209 input_conversion_value.string_value(), err);
210 } 210 }
OLDNEW
« no previous file with comments | « third_party/leveldatabase/env_chromium_win.cc ('k') | tools/gn/setup.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698