summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/master_preferences_dummy.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/master_preferences_dummy.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/master_preferences_dummy.cc')
-rw-r--r--chrome/installer/util/master_preferences_dummy.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/util/master_preferences_dummy.cc b/chrome/installer/util/master_preferences_dummy.cc
index 3f8f549..0112bee 100644
--- a/chrome/installer/util/master_preferences_dummy.cc
+++ b/chrome/installer/util/master_preferences_dummy.cc
@@ -16,7 +16,7 @@
#include "base/values.h"
#include "googleurl/src/gurl.h"
-namespace installer_util {
+namespace installer {
MasterPreferences::MasterPreferences(const CommandLine& cmd_line)
: distribution_(NULL), preferences_read_from_file_(false) {