diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 20:23:49 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 20:23:49 +0000 |
| commit | befe84bbceb40e25af72c21aa6f8492d1eb7ae84 (patch) | |
| tree | 5f2246572d802171682d1fc1b133a79514bd9042 /chrome/installer/util/product.h | |
| parent | cefe5c46afeb6e48e15a396435ca13274406004d (diff) | |
| download | chromium_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/util/product.h')
| -rw-r--r-- | chrome/installer/util/product.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/installer/util/product.h b/chrome/installer/util/product.h index 49a375e..45ee2c2 100644 --- a/chrome/installer/util/product.h +++ b/chrome/installer/util/product.h @@ -14,7 +14,7 @@ class CommandLine; -namespace installer_util { +namespace installer { class MasterPreferences; } @@ -32,7 +32,7 @@ const Product* FindProduct(const Products& products, // Calls WriteInstallerResult for each Product object. void WriteInstallerResult(const Products& products, - installer_util::InstallStatus status, + installer::InstallStatus status, int string_resource_id, const std::wstring* const launch_cmd); @@ -96,7 +96,7 @@ class Product : public base::RefCounted<Product> { // Sets installer error information in registry so that Google Update can read // it and display to the user. - void WriteInstallerResult(installer_util::InstallStatus status, + void WriteInstallerResult(installer::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_util::MasterPreferences& prefs); + const installer::MasterPreferences& prefs); bool AddDistribution(BrowserDistribution* distribution); protected: |