diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 14:44:50 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 14:44:50 +0000 |
| commit | 74ca044ddeb27bca294a88f397e85429ce28e2b6 (patch) | |
| tree | b646397ff7ed1424b77ff4fa125e1151c100ef34 /chrome/installer/setup/setup_util.cc | |
| parent | c17bfcbba2d13a99d1e0a5d0e489fa86755450f8 (diff) | |
| download | chromium_src-74ca044ddeb27bca294a88f397e85429ce28e2b6.zip chromium_src-74ca044ddeb27bca294a88f397e85429ce28e2b6.tar.gz chromium_src-74ca044ddeb27bca294a88f397e85429ce28e2b6.tar.bz2 | |
Revert 69167, itself a revert of 69165 - Merge the installer, installer_util and setup_util namespaces into a single installer namespace.
BUG=61609
TEST=NONE
Review URL: http://codereview.chromium.org/5738009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/setup_util.cc')
| -rw-r--r-- | chrome/installer/setup/setup_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc index 08ea157..16e0af1 100644 --- a/chrome/installer/setup/setup_util.cc +++ b/chrome/installer/setup/setup_util.cc @@ -13,7 +13,7 @@ #include "courgette/courgette.h" #include "third_party/bspatch/mbspatch.h" -int setup_util::ApplyDiffPatch(const FilePath& src, +int installer::ApplyDiffPatch(const FilePath& src, const FilePath& patch, const FilePath& dest) { VLOG(1) << "Applying patch " << patch.value() << " to file " << src.value() @@ -33,7 +33,7 @@ int setup_util::ApplyDiffPatch(const FilePath& src, dest.value().c_str()); } -installer::Version* setup_util::GetVersionFromArchiveDir( +installer::Version* installer::GetVersionFromArchiveDir( const FilePath& chrome_path) { VLOG(1) << "Looking for Chrome version folder under " << chrome_path.value(); FilePath root_path = chrome_path.Append(L"*"); |