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

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

Issue 10912096: C++ reability review for gab. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile errors Created 8 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) 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 #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 <winuser.h> 9 #include <winuser.h>
10 10
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 current_version->reset(installer_state.GetCurrentVersion(original_state)); 126 current_version->reset(installer_state.GetCurrentVersion(original_state));
127 scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList()); 127 scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList());
128 128
129 AddInstallWorkItems(original_state, 129 AddInstallWorkItems(original_state,
130 installer_state, 130 installer_state,
131 setup_path, 131 setup_path,
132 archive_path, 132 archive_path,
133 src_path, 133 src_path,
134 temp_path, 134 temp_path,
135 current_version->get(),
135 new_version, 136 new_version,
136 current_version,
137 install_list.get()); 137 install_list.get());
138 138
139 FilePath new_chrome_exe( 139 FilePath new_chrome_exe(
140 installer_state.target_path().Append(installer::kChromeNewExe)); 140 installer_state.target_path().Append(installer::kChromeNewExe));
141 141
142 installer_state.UpdateStage(installer::EXECUTING); 142 installer_state.UpdateStage(installer::EXECUTING);
143 143
144 if (!install_list->Do()) { 144 if (!install_list->Do()) {
145 installer_state.UpdateStage(installer::ROLLINGBACK); 145 installer_state.UpdateStage(installer::ROLLINGBACK);
146 installer::InstallStatus result = 146 installer::InstallStatus result =
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 uint32 shortcut_options = ShellUtil::SHORTCUT_DUAL_MODE; 563 uint32 shortcut_options = ShellUtil::SHORTCUT_DUAL_MODE;
564 CreateOrUpdateDesktopAndQuickLaunchShortcuts( 564 CreateOrUpdateDesktopAndQuickLaunchShortcuts(
565 installer_state, chrome, shortcut_options); 565 installer_state, chrome, shortcut_options);
566 CreateOrUpdateStartMenuAndTaskbarShortcuts( 566 CreateOrUpdateStartMenuAndTaskbarShortcuts(
567 installer_state, setup_exe, chrome, shortcut_options); 567 installer_state, setup_exe, chrome, shortcut_options);
568 RegisterChromeOnMachine(installer_state, chrome, false); 568 RegisterChromeOnMachine(installer_state, chrome, false);
569 } 569 }
570 } 570 }
571 571
572 } // namespace installer 572 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/setup/chrome_frame_ready_mode.cc ('k') | chrome/installer/setup/install_worker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698