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

Unified Diff: chrome/app/client_util.cc

Issue 5756007: Revert 69165 - Merge the installer, installer_util and setup_util namespaces ... (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 | « ceee/installer_dll/installer_helper.cc ('k') | chrome/browser/browser_main_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/client_util.cc
===================================================================
--- chrome/app/client_util.cc (revision 69165)
+++ chrome/app/client_util.cc (working copy)
@@ -58,7 +58,7 @@
// TODO(cpu) : This is solving the same problem as the environment variable
// so one of them will eventually be deprecated.
std::wstring new_chrome_exe(exe_path);
- new_chrome_exe.append(installer::kChromeNewExe);
+ new_chrome_exe.append(installer_util::kChromeNewExe);
if (::PathFileExistsW(new_chrome_exe.c_str()) &&
ReadRegistryStr(key, google_update::kRegOldVersionField, version)) {
::RegCloseKey(key);
@@ -103,14 +103,14 @@
(cmd_line.GetSwitchValueASCII(switches::kProcessType) ==
switches::kNaClLoaderProcess)) {
// Load the 64-bit DLL when running in a 64-bit process.
- dir->append(installer::kChromeNaCl64Dll);
+ dir->append(installer_util::kChromeNaCl64Dll);
} else {
// Only NaCl broker and loader can be launched as Win64 processes.
NOTREACHED();
return NULL;
}
#else
- dir->append(installer::kChromeDll);
+ dir->append(installer_util::kChromeDll);
#endif
#ifdef NDEBUG
« no previous file with comments | « ceee/installer_dll/installer_helper.cc ('k') | chrome/browser/browser_main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698