diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-17 19:36:03 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-17 19:36:03 +0000 |
| commit | aaa6df4d3d1931eec2235902f791f4e414cd09e8 (patch) | |
| tree | 9552421ac5000a541b897508e4e73fd33325a587 /chromeos/tools | |
| parent | 6beee703776760481ae8fd9784e571ea324d464d (diff) | |
| download | chromium_src-aaa6df4d3d1931eec2235902f791f4e414cd09e8.zip chromium_src-aaa6df4d3d1931eec2235902f791f4e414cd09e8.tar.gz chromium_src-aaa6df4d3d1931eec2235902f791f4e414cd09e8.tar.bz2 | |
Disable "using base::FilePath" on Linux since it now compiles.
This keeps the using for other platforms temporarily. This patch is to "stop
the bleeding" since new conflicts are added every day. The other platforms will
be fixed in followup patches.
This also adds an exception for the MTPD code which has a circular dependency
on FilePath.
Review URL: https://codereview.chromium.org/12282019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/tools')
| -rw-r--r-- | chromeos/tools/onc_validator/onc_validator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/tools/onc_validator/onc_validator.cc b/chromeos/tools/onc_validator/onc_validator.cc index 944bf92..49c31ee 100644 --- a/chromeos/tools/onc_validator/onc_validator.cc +++ b/chromeos/tools/onc_validator/onc_validator.cc @@ -83,7 +83,7 @@ void PrintHelp() { } scoped_ptr<base::DictionaryValue> ReadDictionary(std::string filename) { - FilePath path(filename); + base::FilePath path(filename); JSONFileValueSerializer serializer(path); serializer.set_allow_trailing_comma(true); |