summaryrefslogtreecommitdiffstats
path: root/tools/gn
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-17 23:07:15 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-17 23:07:15 +0000
commit2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c (patch)
tree78766377b2779fe9b9afbc869a97f387b9b3d082 /tools/gn
parent936e85963a6d11c79c7ea774bc41c8729c04693f (diff)
downloadchromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.zip
chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.tar.gz
chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.tar.bz2
Move CommandLine to base namespace.
Fix all forward-declares and header files referencing CommandLine. This keeps a "using base::CommandLine" in the command line header file so that the rest of the source files can be changes in a follow-up. TBR=sky Review URL: https://codereview.chromium.org/196413016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn')
-rw-r--r--tools/gn/setup.h11
-rw-r--r--tools/gn/trace.h2
2 files changed, 8 insertions, 5 deletions
diff --git a/tools/gn/setup.h b/tools/gn/setup.h
index 4d8d29b..0a5c342 100644
--- a/tools/gn/setup.h
+++ b/tools/gn/setup.h
@@ -20,10 +20,13 @@
#include "tools/gn/token.h"
#include "tools/gn/toolchain.h"
-class CommandLine;
class InputFile;
class ParseNode;
+namespace base {
+class CommandLine;
+}
+
extern const char kDotfile_Help[];
// Base class for code shared between Setup and DependentSetup.
@@ -95,10 +98,10 @@ class Setup : public CommonSetup {
private:
// Fills build arguments. Returns true on success.
- bool FillArguments(const CommandLine& cmdline);
+ bool FillArguments(const base::CommandLine& cmdline);
// Fills the root directory into the settings. Returns true on success.
- bool FillSourceDir(const CommandLine& cmdline);
+ bool FillSourceDir(const base::CommandLine& cmdline);
// Fills the build directory given the value the user has specified.
// Must happen after FillSourceDir so we can resolve source-relative
@@ -112,7 +115,7 @@ class Setup : public CommonSetup {
// Run config file.
bool RunConfigFile();
- bool FillOtherConfig(const CommandLine& cmdline);
+ bool FillOtherConfig(const base::CommandLine& cmdline);
Scheduler scheduler_;
diff --git a/tools/gn/trace.h b/tools/gn/trace.h
index b795bf77..61811a7 100644
--- a/tools/gn/trace.h
+++ b/tools/gn/trace.h
@@ -70,7 +70,7 @@ class ScopedTrace {
~ScopedTrace();
void SetToolchain(const Label& label);
- void SetCommandLine(const CommandLine& cmdline);
+ void SetCommandLine(const base::CommandLine& cmdline);
void Done();