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

Unified Diff: chrome/installer/setup/install_worker.cc

Issue 10391153: Revert "Make setup.exe compatible with the component build." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months 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 | « chrome/installer/mini_installer.gyp ('k') | chrome/tools/build/win/create_installer_archive.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index f7067c5fbe47e00ff74ba1933ee10e3f866477ad..74d9a8f68b1c278f022f2b8e296ed363ebf3eaea 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -794,26 +794,6 @@ void AddInstallWorkItems(const InstallationState& original_state,
temp_path);
}
- // For the component build to work with the installer, we need to drop a
- // config file and a manifest by chrome.exe. These files are only found in
- // the archive if this is a component build.
-#if defined(COMPONENT_BUILD)
- static const FilePath::CharType kChromeExeConfig[] =
- FILE_PATH_LITERAL("chrome.exe.config");
- static const FilePath::CharType kChromeExeManifest[] =
- FILE_PATH_LITERAL("chrome.exe.manifest");
- install_list->AddMoveTreeWorkItem(
- src_path.Append(kChromeExeConfig).value(),
- target_path.Append(kChromeExeConfig).value(),
- temp_path.value(),
- WorkItem::ALWAYS_MOVE);
- install_list->AddMoveTreeWorkItem(
- src_path.Append(kChromeExeManifest).value(),
- target_path.Append(kChromeExeManifest).value(),
- temp_path.value(),
- WorkItem::ALWAYS_MOVE);
-#endif // defined(COMPONENT_BUILD)
-
// In the past, we copied rather than moved for system level installs so that
// the permissions of %ProgramFiles% would be picked up. Now that |temp_path|
// is in %ProgramFiles% for system level installs (and in %LOCALAPPDATA%
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/tools/build/win/create_installer_archive.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698