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

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

Issue 5729004: Merge the installer, installer_util and setup_util namespaces into a single i... (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
Index: chrome/installer/util/chrome_frame_distribution.h
===================================================================
--- chrome/installer/util/chrome_frame_distribution.h (revision 68996)
+++ chrome/installer/util/chrome_frame_distribution.h (working copy)
@@ -14,7 +14,7 @@
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/util_constants.h"
-namespace installer_util {
+namespace installer {
class MasterPreferences;
}
@@ -54,7 +54,7 @@
// Update ap value. We implement this simply to have the same behaviour re.
// the ap value.
virtual void UpdateDiffInstallStatus(bool system_install,
- bool incremental_install, installer_util::InstallStatus install_status);
+ bool incremental_install, installer::InstallStatus install_status);
virtual std::vector<FilePath> GetKeyFiles();
@@ -67,7 +67,7 @@
// Disallow construction from non-friends.
explicit ChromeFrameDistribution(
- const installer_util::MasterPreferences& prefs);
+ const installer::MasterPreferences& prefs);
// Determines whether this Chrome Frame distribution is being used to work
// with CEEE bits as well.

Powered by Google App Engine
This is Rietveld 408576698