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

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

Issue 7386002: Rename CommandLine::GetCommandLineString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. Created 9 years, 5 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
« no previous file with comments | « chrome/common/switch_utils_unittest.cc ('k') | chrome/installer/setup/install_worker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/installer/setup/install.h" 5 #include "chrome/installer/setup/install.h"
6 6
7 #include <shlobj.h> 7 #include <shlobj.h>
8 #include <time.h> 8 #include <time.h>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 FilePath setup_exe(installer_state.GetInstallerDirectory(new_version) 160 FilePath setup_exe(installer_state.GetInstallerDirectory(new_version)
161 .Append(setup_path.BaseName())); 161 .Append(setup_path.BaseName()));
162 162
163 CommandLine arguments(CommandLine::NO_PROGRAM); 163 CommandLine arguments(CommandLine::NO_PROGRAM);
164 AppendUninstallCommandLineFlags(installer_state, product, &arguments); 164 AppendUninstallCommandLineFlags(installer_state, product, &arguments);
165 VLOG(1) << "Creating/updating uninstall link at " 165 VLOG(1) << "Creating/updating uninstall link at "
166 << uninstall_link.value(); 166 << uninstall_link.value();
167 ret = file_util::CreateShortcutLink(setup_exe.value().c_str(), 167 ret = file_util::CreateShortcutLink(setup_exe.value().c_str(),
168 uninstall_link.value().c_str(), 168 uninstall_link.value().c_str(),
169 NULL, 169 NULL,
170 arguments.command_line_string().c_str(), 170 arguments.GetCommandLineString().c_str(),
171 NULL, 171 NULL,
172 setup_exe.value().c_str(), 172 setup_exe.value().c_str(),
173 0, 173 0,
174 NULL); 174 NULL);
175 } 175 }
176 } 176 }
177 177
178 // Update Desktop and Quick Launch shortcuts. If --create-new-shortcuts 178 // Update Desktop and Quick Launch shortcuts. If --create-new-shortcuts
179 // is specified we want to create them, otherwise we update them only if 179 // is specified we want to create them, otherwise we update them only if
180 // they exist. 180 // they exist.
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 installer_state.RemoveOldVersionDirectories( 424 installer_state.RemoveOldVersionDirectories(
425 new_version, 425 new_version,
426 existing_version.get(), 426 existing_version.get(),
427 install_temp_path); 427 install_temp_path);
428 } 428 }
429 429
430 return result; 430 return result;
431 } 431 }
432 432
433 } // namespace installer 433 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/common/switch_utils_unittest.cc ('k') | chrome/installer/setup/install_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698