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

Side by Side Diff: chrome/installer/util/google_chrome_distribution.cc

Issue 297233010: Revert 273108 "Omaha configuration parameters now use Wow6432Nod..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2017/src/
Patch Set: Created 6 years, 7 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/installer/util/compat_checks.cc ('k') | chrome/installer/util/google_update_settings.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) 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 defines specific implementation of BrowserDistribution class for 5 // This file defines specific implementation of BrowserDistribution class for
6 // Google Chrome. 6 // Google Chrome.
7 7
8 #include "chrome/installer/util/google_chrome_distribution.h" 8 #include "chrome/installer/util/google_chrome_distribution.h"
9 9
10 #include <windows.h> 10 #include <windows.h>
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 204
205 std::string GoogleChromeDistribution::GetNetworkStatsServer() const { 205 std::string GoogleChromeDistribution::GetNetworkStatsServer() const {
206 return chrome_common_net::kEchoTestServerLocation; 206 return chrome_common_net::kEchoTestServerLocation;
207 } 207 }
208 208
209 base::string16 GoogleChromeDistribution::GetDistributionData(HKEY root_key) { 209 base::string16 GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
210 base::string16 sub_key(google_update::kRegPathClientState); 210 base::string16 sub_key(google_update::kRegPathClientState);
211 sub_key.append(L"\\"); 211 sub_key.append(L"\\");
212 sub_key.append(product_guid()); 212 sub_key.append(product_guid());
213 213
214 base::win::RegKey client_state_key( 214 base::win::RegKey client_state_key(root_key, sub_key.c_str(), KEY_READ);
215 root_key, sub_key.c_str(), KEY_READ | KEY_WOW64_32KEY);
216 base::string16 result; 215 base::string16 result;
217 base::string16 brand_value; 216 base::string16 brand_value;
218 if (client_state_key.ReadValue(google_update::kRegRLZBrandField, 217 if (client_state_key.ReadValue(google_update::kRegRLZBrandField,
219 &brand_value) == ERROR_SUCCESS) { 218 &brand_value) == ERROR_SUCCESS) {
220 result = google_update::kRegRLZBrandField; 219 result = google_update::kRegRLZBrandField;
221 result.append(L"="); 220 result.append(L"=");
222 result.append(brand_value); 221 result.append(brand_value);
223 result.append(L"&"); 222 result.append(L"&");
224 } 223 }
225 224
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 product_guid()); 291 product_guid());
293 } 292 }
294 293
295 bool GoogleChromeDistribution::ShouldSetExperimentLabels() { 294 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
296 return true; 295 return true;
297 } 296 }
298 297
299 bool GoogleChromeDistribution::HasUserExperiments() { 298 bool GoogleChromeDistribution::HasUserExperiments() {
300 return true; 299 return true;
301 } 300 }
OLDNEW
« no previous file with comments | « chrome/installer/util/compat_checks.cc ('k') | chrome/installer/util/google_update_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698