diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 05:46:20 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 05:46:20 +0000 |
| commit | 9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb (patch) | |
| tree | 0818f910c522fb5bda00cab55412201251db32f7 /cloud_print/virtual_driver/win | |
| parent | ad5b14e00b36aab6e2b2d6aba8477a5dd9a11998 (diff) | |
| download | chromium_src-9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb.zip chromium_src-9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb.tar.gz chromium_src-9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb.tar.bz2 | |
Revert 198820 "Move FileEnumerator to its own file, do some refa..."
Broke both windows clobber and official builders' compile with this error:
771>Link:
771> Creating library ..\..\..\build\Release\lib\gcp_portmon64.lib and
object ..\..\..\build\Release\lib\gcp_portmon64.exp
771>base.lib(path_service.obj) : fatalerror LNK1112: module machine type 'X86'
conflicts with target machine type 'x64'
771>
771>Build FAILED.
> Move FileEnumerator to its own file, do some refactoring.
>
> It creates a class FileInfo to contain the details rather than using a platform-specific typedef. This allows the accessors GetName, GetSize, etc. to be moved directly to this class (previously they were static helpers on the FileEnumerator class) which makes a bunch of code much cleaner. It also gives reasonable getting and initialization which the previous version lacked.
>
> BUG=175002
> R=rvargas@chromium.org
>
> Review URL: https://codereview.chromium.org/13165005
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/14824006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print/virtual_driver/win')
| -rw-r--r-- | cloud_print/virtual_driver/win/port_monitor/port_monitor.cc | 8 | ||||
| -rw-r--r-- | cloud_print/virtual_driver/win/virtual_driver.gypi | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc index 9008285..c13228a 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc @@ -15,7 +15,6 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/file_util.h" -#include "base/files/file_enumerator.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process.h" @@ -120,11 +119,14 @@ base::FilePath GetAppDataDir() { // Delete files which where not deleted by chrome. void DeleteLeakedFiles(const base::FilePath& dir) { + using file_util::FileEnumerator; base::Time delete_before = base::Time::Now() - base::TimeDelta::FromDays(1); - base::FileEnumerator enumerator(dir, false, base::FileEnumerator::FILES); + FileEnumerator enumerator(dir, false, FileEnumerator::FILES); for (base::FilePath file_path = enumerator.Next(); !file_path.empty(); file_path = enumerator.Next()) { - if (enumerator.GetInfo().GetLastModifiedTime() < delete_before) + FileEnumerator::FindInfo info; + enumerator.GetFindInfo(&info); + if (FileEnumerator::GetLastModifiedTime(info) < delete_before) file_util::Delete(file_path, false); } } diff --git a/cloud_print/virtual_driver/win/virtual_driver.gypi b/cloud_print/virtual_driver/win/virtual_driver.gypi index 26dc308..80c0ffb 100644 --- a/cloud_print/virtual_driver/win/virtual_driver.gypi +++ b/cloud_print/virtual_driver/win/virtual_driver.gypi @@ -35,7 +35,6 @@ 'port_monitor/port_monitor.h', ], 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', 'virtual_driver_lib<(virtual_driver_suffix)', ], }, |