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

Side by Side Diff: chrome/installer/setup/install_worker.cc

Issue 2306933002: Remove wow_helper. (Closed)
Patch Set: Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This file contains the definitions of the installer functions that build 5 // This file contains the definitions of the installer functions that build
6 // the WorkItemList used to install the application. 6 // the WorkItemList used to install the application.
7 7
8 #include "chrome/installer/setup/install_worker.h" 8 #include "chrome/installer/setup/install_worker.h"
9 9
10 #include <oaidl.h> 10 #include <oaidl.h>
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 WorkItem::ALWAYS); 324 WorkItem::ALWAYS);
325 } else { 325 } else {
326 install_list->AddCopyTreeWorkItem( 326 install_list->AddCopyTreeWorkItem(
327 src_path.Append(installer::kChromeExe).value(), 327 src_path.Append(installer::kChromeExe).value(),
328 target_path.Append(installer::kChromeExe).value(), 328 target_path.Append(installer::kChromeExe).value(),
329 temp_path.value(), 329 temp_path.value(),
330 WorkItem::NEW_NAME_IF_IN_USE, 330 WorkItem::NEW_NAME_IF_IN_USE,
331 new_chrome_exe.value()); 331 new_chrome_exe.value());
332 } 332 }
333 333
334 // Extra executable for 64 bit systems.
335 // NOTE: We check for "not disabled" so that if the API call fails, we play it
336 // safe and copy the executable anyway.
337 // NOTE: the file wow_helper.exe is only needed for Vista and below.
338 if (base::win::OSInfo::GetInstance()->wow64_status() !=
339 base::win::OSInfo::WOW64_DISABLED &&
340 base::win::GetVersion() <= base::win::VERSION_VISTA) {
341 install_list->AddMoveTreeWorkItem(
342 src_path.Append(installer::kWowHelperExe).value(),
343 target_path.Append(installer::kWowHelperExe).value(),
344 temp_path.value(),
345 WorkItem::ALWAYS_MOVE);
346 }
347
348 // Install kVisualElementsManifest if it is present in |src_path|. No need to 334 // Install kVisualElementsManifest if it is present in |src_path|. No need to
349 // make this a conditional work item as if the file is not there now, it will 335 // make this a conditional work item as if the file is not there now, it will
350 // never be. 336 // never be.
351 if (base::PathExists( 337 if (base::PathExists(
352 src_path.Append(installer::kVisualElementsManifest))) { 338 src_path.Append(installer::kVisualElementsManifest))) {
353 install_list->AddMoveTreeWorkItem( 339 install_list->AddMoveTreeWorkItem(
354 src_path.Append(installer::kVisualElementsManifest).value(), 340 src_path.Append(installer::kVisualElementsManifest).value(),
355 target_path.Append(installer::kVisualElementsManifest).value(), 341 target_path.Append(installer::kVisualElementsManifest).value(),
356 temp_path.value(), 342 temp_path.value(),
357 WorkItem::ALWAYS_MOVE); 343 WorkItem::ALWAYS_MOVE);
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 // Unconditionally remove the legacy Quick Enable command from the binaries. 1345 // Unconditionally remove the legacy Quick Enable command from the binaries.
1360 // Do this even if multi-install Chrome isn't installed to ensure that it is 1346 // Do this even if multi-install Chrome isn't installed to ensure that it is
1361 // not left behind in any case. 1347 // not left behind in any case.
1362 work_item_list->AddDeleteRegKeyWorkItem( 1348 work_item_list->AddDeleteRegKeyWorkItem(
1363 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) 1349 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY)
1364 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + 1350 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) +
1365 " command"); 1351 " command");
1366 } 1352 }
1367 1353
1368 } // namespace installer 1354 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer/chrome.release ('k') | chrome/installer/setup/setup_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698