summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/channel_info.cc
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 20:23:49 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 20:23:49 +0000
commitbefe84bbceb40e25af72c21aa6f8492d1eb7ae84 (patch)
tree5f2246572d802171682d1fc1b133a79514bd9042 /chrome/installer/util/channel_info.cc
parentcefe5c46afeb6e48e15a396435ca13274406004d (diff)
downloadchromium_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/channel_info.cc')
-rw-r--r--chrome/installer/util/channel_info.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/util/channel_info.cc b/chrome/installer/util/channel_info.cc
index 4025cb9..4acc4d4 100644
--- a/chrome/installer/util/channel_info.cc
+++ b/chrome/installer/util/channel_info.cc
@@ -31,7 +31,7 @@ const wchar_t* const kModifiers[] = {
} // namespace
-namespace installer_util {
+namespace installer {
// static
bool ChannelInfo::HasModifier(const wchar_t* modifier,
@@ -125,4 +125,4 @@ bool ChannelInfo::SetMultiInstall(bool value) {
return SetModifier(kModMultiInstall, value, &value_);
}
-} // namespace installer_util
+} // namespace installer