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

Unified Diff: ceee/common/install_utils.cc

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
« no previous file with comments | « no previous file | ceee/installer_dll/installer_helper.cc » ('j') | chrome/installer/util/master_preferences.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ceee/common/install_utils.cc
===================================================================
--- ceee/common/install_utils.cc (revision 68996)
+++ ceee/common/install_utils.cc (working copy)
@@ -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 @@
// 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;
« no previous file with comments | « no previous file | ceee/installer_dll/installer_helper.cc » ('j') | chrome/installer/util/master_preferences.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698