diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 22:05:59 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 22:05:59 +0000 |
| commit | fbf745a2c70813a8fca9d5de6574fc602b3ebfeb (patch) | |
| tree | 818185d9363d9193ee54e0d0a442f937804f84bf /base/file_util_win.cc | |
| parent | 552079df978b40210f549546739b6393fdc3b8b0 (diff) | |
| download | chromium_src-fbf745a2c70813a8fca9d5de6574fc602b3ebfeb.zip chromium_src-fbf745a2c70813a8fca9d5de6574fc602b3ebfeb.tar.gz chromium_src-fbf745a2c70813a8fca9d5de6574fc602b3ebfeb.tar.bz2 | |
file_util: The member variable |pattern_| has a different type (FilePath) from the constructor parameter (StringType).
So fix this type to match with the constructor.
Original patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/465119/show
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/466071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_win.cc')
| -rw-r--r-- | base/file_util_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/file_util_win.cc b/base/file_util_win.cc index 9fae6a39..9d29d80 100644 --- a/base/file_util_win.cc +++ b/base/file_util_win.cc @@ -739,7 +739,7 @@ FilePath FileEnumerator::Next() { // Start a new find operation. FilePath src = root_path_; - if (pattern_.value().empty()) + if (pattern_.empty()) src = src.Append(L"*"); // No pattern = match everything. else src = src.Append(pattern_); @@ -763,7 +763,7 @@ FilePath FileEnumerator::Next() { // in the root search directory, but for those directories which were // matched, we want to enumerate all files inside them. This will happen // when the handle is empty. - pattern_ = FilePath(); + pattern_ = FilePath::StringType(); return Next(); } |