| Index: chrome/installer/util/product.h
|
| ===================================================================
|
| --- chrome/installer/util/product.h (revision 69165)
|
| +++ chrome/installer/util/product.h (working copy)
|
| @@ -14,7 +14,7 @@
|
|
|
| class CommandLine;
|
|
|
| -namespace installer {
|
| +namespace installer_util {
|
| class MasterPreferences;
|
| }
|
|
|
| @@ -32,7 +32,7 @@
|
|
|
| // 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 @@
|
|
|
| // 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 @@
|
| const Products& products() const;
|
|
|
| bool AddDistribution(BrowserDistribution::Type type,
|
| - const installer::MasterPreferences& prefs);
|
| + const installer_util::MasterPreferences& prefs);
|
| bool AddDistribution(BrowserDistribution* distribution);
|
|
|
| protected:
|
|
|