Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1711)

Unified Diff: chrome/installer/util/product.h

Issue 5756007: Revert 69165 - Merge the installer, installer_util and setup_util namespaces ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/package_unittest.cc ('k') | chrome/installer/util/product.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« no previous file with comments | « chrome/installer/util/package_unittest.cc ('k') | chrome/installer/util/product.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698