summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup/setup_util.h
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 20:23:49 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 20:23:49 +0000
commitbefe84bbceb40e25af72c21aa6f8492d1eb7ae84 (patch)
tree5f2246572d802171682d1fc1b133a79514bd9042 /chrome/installer/setup/setup_util.h
parentcefe5c46afeb6e48e15a396435ca13274406004d (diff)
downloadchromium_src-befe84bbceb40e25af72c21aa6f8492d1eb7ae84.zip
chromium_src-befe84bbceb40e25af72c21aa6f8492d1eb7ae84.tar.gz
chromium_src-befe84bbceb40e25af72c21aa6f8492d1eb7ae84.tar.bz2
Merge the installer, installer_util and setup_util namespaces into a single installer namespace.
BUG=61609 TEST=NONE Review URL: http://codereview.chromium.org/5729004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/setup_util.h')
-rw-r--r--chrome/installer/setup/setup_util.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/setup/setup_util.h b/chrome/installer/setup/setup_util.h
index 0858070..468ed62 100644
--- a/chrome/installer/setup/setup_util.h
+++ b/chrome/installer/setup/setup_util.h
@@ -12,7 +12,7 @@
class FilePath;
-namespace setup_util {
+namespace installer {
// Apply a diff patch to source file. First tries to apply it using courgette
// since it checks for courgette header and fails quickly. If that fails
// tries to apply the patch using regular bsdiff. Returns status code.
@@ -24,6 +24,6 @@ namespace setup_util {
// Chrome_path should contain a version folder.
// Returns the first version found or NULL if no version is found.
installer::Version* GetVersionFromArchiveDir(const FilePath& chrome_path);
-} // namespace setup_util
+} // namespace installer
#endif // CHROME_INSTALLER_SETUP_SETUP_UTIL_H_