diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-09 17:42:26 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-09 17:42:26 +0000 |
| commit | f0ff2ad2c5bcf8e206baf27dbfaeef7743fd6c0d (patch) | |
| tree | f16870d528455ef5acb84e180e6e07afb308ee6f /cloud_print | |
| parent | 456f3b4c2d9942fd86e7c374426d37f029542a9a (diff) | |
| download | chromium_src-f0ff2ad2c5bcf8e206baf27dbfaeef7743fd6c0d.zip chromium_src-f0ff2ad2c5bcf8e206baf27dbfaeef7743fd6c0d.tar.gz chromium_src-f0ff2ad2c5bcf8e206baf27dbfaeef7743fd6c0d.tar.bz2 | |
Move Copy* into the base namespace.
This also creates a new base::internal namespace in file_util and I moved some of the internal functions in file_util to there.
BUG=
TBR=jam
Review URL: https://codereview.chromium.org/18332014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print')
| -rw-r--r-- | cloud_print/common/win/install_utils.cc | 2 | ||||
| -rw-r--r-- | cloud_print/virtual_driver/win/install/setup.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cloud_print/common/win/install_utils.cc b/cloud_print/common/win/install_utils.cc index ab8a66e..0edb161 100644 --- a/cloud_print/common/win/install_utils.cc +++ b/cloud_print/common/win/install_utils.cc @@ -174,7 +174,7 @@ void DeleteProgramDir(const std::string& delete_switch) { base::FilePath temp_path; if (!file_util::CreateTemporaryFile(&temp_path)) return; - file_util::CopyFile(installer_source, temp_path); + base::CopyFile(installer_source, temp_path); base::DeleteAfterReboot(temp_path); CommandLine command_line(temp_path); command_line.AppendSwitchPath(delete_switch, installer_source.DirName()); diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc index f1b870a..85591ee 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc @@ -111,7 +111,7 @@ HRESULT RegisterPortMonitor(bool install, const base::FilePath& install_path) { if (install) { base::FilePath source_path = install_path.Append(GetPortMonitorDllName()); - if (!file_util::CopyFile(source_path, target_path)) { + if (!base::CopyFile(source_path, target_path)) { LOG(ERROR) << "Unable copy port monitor dll from " << source_path.value() << " to " << target_path.value(); return GetLastHResult(); @@ -241,7 +241,7 @@ void ReadyDriverDependencies(const base::FilePath& destination) { base::FilePath src_path = driver_cache_path.Append(kDependencyList[i]); if (!file_util::PathExists(src_path)) src_path = GetSystemPath(kDependencyList[i]); - file_util::CopyFile(src_path, dst_path); + base::CopyFile(src_path, dst_path); } } } |