From 5ddd1eaaaaa5512ee780789bfb0164a97bca933d Mon Sep 17 00:00:00 2001 From: "robertshield@chromium.org" Date: Tue, 14 Dec 2010 20:32:00 +0000 Subject: Revert 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/5729004 TBR=robertshield@chromium.org Review URL: http://codereview.chromium.org/5756007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69167 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/util/product.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/installer/util/product.h') diff --git a/chrome/installer/util/product.h b/chrome/installer/util/product.h index 45ee2c2..49a375e 100644 --- a/chrome/installer/util/product.h +++ b/chrome/installer/util/product.h @@ -14,7 +14,7 @@ class CommandLine; -namespace installer { +namespace installer_util { class MasterPreferences; } @@ -32,7 +32,7 @@ const Product* FindProduct(const Products& products, // Calls WriteInstallerResult for each Product object. void WriteInstallerResult(const Products& products, - installer::InstallStatus status, + installer_util::InstallStatus status, int string_resource_id, const std::wstring* const launch_cmd); @@ -96,7 +96,7 @@ class Product : public base::RefCounted { // Sets installer error information in registry so that Google Update can read // it and display to the user. - void WriteInstallerResult(installer::InstallStatus status, + void WriteInstallerResult(installer_util::InstallStatus status, int string_resource_id, const std::wstring* const launch_cmd) const; @@ -139,7 +139,7 @@ class ProductPackageMapping { const Products& products() const; bool AddDistribution(BrowserDistribution::Type type, - const installer::MasterPreferences& prefs); + const installer_util::MasterPreferences& prefs); bool AddDistribution(BrowserDistribution* distribution); protected: -- cgit v1.1