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

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

Issue 10836247: Refactor ShellUtil shortcut code -- single multi-purpose methods as opposed to many slighlty diffe… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: robert is the king of pool Created 8 years, 2 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 | Annotate | Revision Log
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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 } else { 249 } else {
250 PathService::Get(base::DIR_START_MENU, &uninstall_link); 250 PathService::Get(base::DIR_START_MENU, &uninstall_link);
251 } 251 }
252 252
253 if (uninstall_link.empty()) { 253 if (uninstall_link.empty()) {
254 LOG(ERROR) << "Failed to get location for shortcut."; 254 LOG(ERROR) << "Failed to get location for shortcut.";
255 } else { 255 } else {
256 uninstall_link = uninstall_link.Append( 256 uninstall_link = uninstall_link.Append(
257 product.distribution()->GetAppShortCutName()); 257 product.distribution()->GetAppShortCutName());
258 uninstall_link = uninstall_link.Append( 258 uninstall_link = uninstall_link.Append(
259 product.distribution()->GetUninstallLinkName() + L".lnk"); 259 product.distribution()->GetUninstallLinkName() + installer::kLnkExt);
260 VLOG(1) << "Deleting old uninstall shortcut (if present): " 260 VLOG(1) << "Deleting old uninstall shortcut (if present): "
261 << uninstall_link.value(); 261 << uninstall_link.value();
262 WorkItem* delete_link = work_item_list->AddDeleteTreeWorkItem( 262 WorkItem* delete_link = work_item_list->AddDeleteTreeWorkItem(
263 uninstall_link, temp_path); 263 uninstall_link, temp_path);
264 delete_link->set_ignore_failure(true); 264 delete_link->set_ignore_failure(true);
265 delete_link->set_log_message( 265 delete_link->set_log_message(
266 "Failed to delete old uninstall shortcut."); 266 "Failed to delete old uninstall shortcut.");
267 } 267 }
268 } 268 }
269 269
(...skipping 1324 matching lines...) Expand 10 before | Expand all | Expand 10 after
1594 // Log everything for now. 1594 // Log everything for now.
1595 cmd_line.AppendSwitch(installer::switches::kVerboseLogging); 1595 cmd_line.AppendSwitch(installer::switches::kVerboseLogging);
1596 1596
1597 AppCommand cmd(cmd_line.GetCommandLineString()); 1597 AppCommand cmd(cmd_line.GetCommandLineString());
1598 cmd.set_is_auto_run_on_os_upgrade(true); 1598 cmd.set_is_auto_run_on_os_upgrade(true);
1599 cmd.AddWorkItems(installer_state.root_key(), cmd_key, install_list); 1599 cmd.AddWorkItems(installer_state.root_key(), cmd_key, install_list);
1600 } 1600 }
1601 } 1601 }
1602 1602
1603 } // namespace installer 1603 } // namespace installer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698