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

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

Issue 8555010: Write the install language to the registry for user-level installs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 1 month 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 | « no previous file | chrome/installer/setup/install_worker.h » ('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/chrome_frame_quick_enable.h" 5 #include "chrome/installer/setup/chrome_frame_quick_enable.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/scoped_temp_dir.h" 10 #include "base/scoped_temp_dir.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER)); 101 installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER));
102 102
103 FilePath setup_path(chrome_state->GetSetupPath()); 103 FilePath setup_path(chrome_state->GetSetupPath());
104 const Version& new_version = chrome_state->version(); 104 const Version& new_version = chrome_state->version();
105 FilePath new_chrome_exe( 105 FilePath new_chrome_exe(
106 installer_state->target_path().Append(installer::kChromeNewExe)); 106 installer_state->target_path().Append(installer::kChromeNewExe));
107 107
108 // This creates the uninstallation entry for GCF. 108 // This creates the uninstallation entry for GCF.
109 AddUninstallShortcutWorkItems(*installer_state, setup_path, new_version, 109 AddUninstallShortcutWorkItems(*installer_state, setup_path, new_version,
110 item_list.get(), *cf); 110 item_list.get(), *cf);
111 // Always set the "lang" value since quick-enable always happens in the
112 // context of an interactive session with a user.
111 AddVersionKeyWorkItems(installer_state->root_key(), cf->distribution(), 113 AddVersionKeyWorkItems(installer_state->root_key(), cf->distribution(),
112 new_version, item_list.get()); 114 new_version, true, item_list.get());
113 AddChromeFrameWorkItems(machine_state, *installer_state, setup_path, 115 AddChromeFrameWorkItems(machine_state, *installer_state, setup_path,
114 new_version, *cf, item_list.get()); 116 new_version, *cf, item_list.get());
115 117
116 const Version* opv = chrome_state->old_version(); 118 const Version* opv = chrome_state->old_version();
117 AppendPostInstallTasks(*installer_state, setup_path, new_chrome_exe, opv, 119 AppendPostInstallTasks(*installer_state, setup_path, new_chrome_exe, opv,
118 new_version, temp_path.path(), item_list.get()); 120 new_version, temp_path.path(), item_list.get());
119 121
120 // Before updating the channel values, add Chrome back to the mix so that 122 // Before updating the channel values, add Chrome back to the mix so that
121 // all multi-installed products' channel values get updated. 123 // all multi-installed products' channel values get updated.
122 installer_state->AddProductFromState(BrowserDistribution::CHROME_BROWSER, 124 installer_state->AddProductFromState(BrowserDistribution::CHROME_BROWSER,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 BrowserDistribution::CHROME_BINARIES), 165 BrowserDistribution::CHROME_BINARIES),
164 true)) { 166 true)) {
165 LOG(ERROR) << "Failed to set EULA consent for multi-install binaries."; 167 LOG(ERROR) << "Failed to set EULA consent for multi-install binaries.";
166 } 168 }
167 } 169 }
168 170
169 return status; 171 return status;
170 } 172 }
171 173
172 } // namespace installer 174 } // namespace installer
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/setup/install_worker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698