diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 14:44:50 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 14:44:50 +0000 |
| commit | 74ca044ddeb27bca294a88f397e85429ce28e2b6 (patch) | |
| tree | b646397ff7ed1424b77ff4fa125e1151c100ef34 /ceee | |
| parent | c17bfcbba2d13a99d1e0a5d0e489fa86755450f8 (diff) | |
| download | chromium_src-74ca044ddeb27bca294a88f397e85429ce28e2b6.zip chromium_src-74ca044ddeb27bca294a88f397e85429ce28e2b6.tar.gz chromium_src-74ca044ddeb27bca294a88f397e85429ce28e2b6.tar.bz2 | |
Revert 69167, itself a revert of 69165 - Merge the installer, installer_util and setup_util namespaces into a single installer namespace.
BUG=61609
TEST=NONE
Review URL: http://codereview.chromium.org/5738009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
| -rw-r--r-- | ceee/common/install_utils.cc | 8 | ||||
| -rw-r--r-- | ceee/installer_dll/installer_helper.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ceee/common/install_utils.cc b/ceee/common/install_utils.cc index e737d5b..e342023 100644 --- a/ceee/common/install_utils.cc +++ b/ceee/common/install_utils.cc @@ -13,7 +13,7 @@ #include "base/path_service.h" #include "chrome/installer/util/util_constants.h" -namespace installer_util { +namespace installer { namespace switches { // TODO(joi@chromium.org) Move to chrome/installer/util_constants.h // when we refactor this logic to be in the installer rather than @@ -43,10 +43,10 @@ bool ShouldRegisterImpl(bool check_firefox) { // also be provided. CommandLine current_command_line(CommandLine::NO_PROGRAM); current_command_line.ParseFromString(::GetCommandLine()); - if (current_command_line.HasSwitch(installer_util::switches::kEnableCeee) && - current_command_line.HasSwitch(installer_util::switches::kChromeFrame) && + if (current_command_line.HasSwitch(installer::switches::kEnableCeee) && + current_command_line.HasSwitch(installer::switches::kChromeFrame) && (!check_firefox || current_command_line.HasSwitch( - installer_util::switches::kEnableFfCeee))) { + installer::switches::kEnableFfCeee))) { return true; } else { return false; diff --git a/ceee/installer_dll/installer_helper.cc b/ceee/installer_dll/installer_helper.cc index a435e17..003bb9f 100644 --- a/ceee/installer_dll/installer_helper.cc +++ b/ceee/installer_dll/installer_helper.cc @@ -263,7 +263,7 @@ HRESULT SetCeeeChannelModifier(bool new_value) { } // We create the "ap" value if it doesn't exist. - installer_util::ChannelInfo channel_info; + installer::ChannelInfo channel_info; channel_info.Initialize(key); if (channel_info.SetCeee(new_value) && !channel_info.Write(&key)) { |