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

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

Issue 7976045: Fix in-use updates for Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Some changes incorporated Created 9 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 | Annotate | Revision Log
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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 AddInstallWorkItems(original_state, 270 AddInstallWorkItems(original_state,
271 installer_state, 271 installer_state,
272 setup_path, 272 setup_path,
273 archive_path, 273 archive_path,
274 src_path, 274 src_path,
275 temp_path, 275 temp_path,
276 new_version, 276 new_version,
277 current_version, 277 current_version,
278 install_list.get()); 278 install_list.get());
279 279
280 AddElevationPolicyWorkItems(original_state, installer_state, new_version,
281 install_list.get());
282
283 FilePath new_chrome_exe( 280 FilePath new_chrome_exe(
284 installer_state.target_path().Append(installer::kChromeNewExe)); 281 installer_state.target_path().Append(installer::kChromeNewExe));
285 282
286 installer_state.UpdateStage(installer::EXECUTING); 283 installer_state.UpdateStage(installer::EXECUTING);
287 284
288 if (!install_list->Do()) { 285 if (!install_list->Do()) {
289 installer_state.UpdateStage(installer::ROLLINGBACK); 286 installer_state.UpdateStage(installer::ROLLINGBACK);
290 installer::InstallStatus result = 287 installer::InstallStatus result =
291 file_util::PathExists(new_chrome_exe) && current_version->get() && 288 file_util::PathExists(new_chrome_exe) && current_version->get() &&
292 new_version.Equals(*current_version->get()) ? 289 new_version.Equals(*current_version->get()) ?
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 installer_state.RemoveOldVersionDirectories( 421 installer_state.RemoveOldVersionDirectories(
425 new_version, 422 new_version,
426 existing_version.get(), 423 existing_version.get(),
427 install_temp_path); 424 install_temp_path);
428 } 425 }
429 426
430 return result; 427 return result;
431 } 428 }
432 429
433 } // namespace installer 430 } // namespace installer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698