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

Unified Diff: tools/gn/ninja_build_writer.cc

Issue 819223002: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/gn_main.cc ('k') | tools/gn/scheduler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/ninja_build_writer.cc
diff --git a/tools/gn/ninja_build_writer.cc b/tools/gn/ninja_build_writer.cc
index 9a5e2d68ac45bb0be98b9b286a4e1a7d0a607b9a..d4ab3fb71dca12ad4cd0597809200f7051546bd1 100644
--- a/tools/gn/ninja_build_writer.cc
+++ b/tools/gn/ninja_build_writer.cc
@@ -35,7 +35,7 @@ std::string GetSelfInvocationCommand(const BuildSettings* build_settings) {
base::FilePath executable;
PathService::Get(base::FILE_EXE, &executable);
- CommandLine cmdline(executable.NormalizePathSeparatorsTo('/'));
+ base::CommandLine cmdline(executable.NormalizePathSeparatorsTo('/'));
cmdline.AppendArg("gen");
cmdline.AppendArg(build_settings->build_dir().value());
cmdline.AppendSwitchPath(std::string("--") + switches::kRoot,
@@ -52,9 +52,10 @@ std::string GetSelfInvocationCommand(const BuildSettings* build_settings) {
escape_shell.inhibit_quoting = true;
#endif
- const CommandLine& our_cmdline = *CommandLine::ForCurrentProcess();
- const CommandLine::SwitchMap& switches = our_cmdline.GetSwitches();
- for (CommandLine::SwitchMap::const_iterator i = switches.begin();
+ const base::CommandLine& our_cmdline =
+ *base::CommandLine::ForCurrentProcess();
+ const base::CommandLine::SwitchMap& switches = our_cmdline.GetSwitches();
+ for (base::CommandLine::SwitchMap::const_iterator i = switches.begin();
i != switches.end(); ++i) {
// Only write arguments we haven't already written. Always skip "args"
// since those will have been written to the file and will be used
« no previous file with comments | « tools/gn/gn_main.cc ('k') | tools/gn/scheduler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698