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

Side by Side Diff: chrome/installer/util/product.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, 6 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/installer_state.cc ('k') | chrome/installer/util/shell_util.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 #include "chrome/installer/util/product.h" 5 #include "chrome/installer/util/product.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 ::CloseHandle(pi.hProcess); 109 ::CloseHandle(pi.hProcess);
110 } 110 }
111 111
112 return success; 112 return success;
113 } 113 }
114 114
115 bool Product::SetMsiMarker(bool system_install, bool set) const { 115 bool Product::SetMsiMarker(bool system_install, bool set) const {
116 HKEY reg_root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; 116 HKEY reg_root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
117 RegKey client_state_key; 117 RegKey client_state_key;
118 LONG result = client_state_key.Open(reg_root, 118 LONG result = client_state_key.Open(reg_root,
119 distribution_->GetStateKey().c_str(), 119 distribution_->GetStateKey().c_str(), KEY_READ | KEY_WRITE);
120 KEY_READ | KEY_WRITE | KEY_WOW64_32KEY);
121 if (result == ERROR_SUCCESS) { 120 if (result == ERROR_SUCCESS) {
122 result = client_state_key.WriteValue(google_update::kRegMSIField, 121 result = client_state_key.WriteValue(google_update::kRegMSIField,
123 set ? 1 : 0); 122 set ? 1 : 0);
124 } 123 }
125 124
126 LOG_IF(ERROR, result != ERROR_SUCCESS) << "Failed to Open or Write MSI value" 125 LOG_IF(ERROR, result != ERROR_SUCCESS) << "Failed to Open or Write MSI value"
127 "to client state key. error: " << result; 126 "to client state key. error: " << result;
128 127
129 return (result == ERROR_SUCCESS); 128 return (result == ERROR_SUCCESS);
130 } 129 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 if (distribution_->HasUserExperiments()) { 165 if (distribution_->HasUserExperiments()) {
167 VLOG(1) << "LaunchUserExperiment status: " << status << " product: " 166 VLOG(1) << "LaunchUserExperiment status: " << status << " product: "
168 << distribution_->GetDisplayName() 167 << distribution_->GetDisplayName()
169 << " system_level: " << system_level; 168 << " system_level: " << system_level;
170 operations_->LaunchUserExperiment( 169 operations_->LaunchUserExperiment(
171 setup_path, options_, status, system_level); 170 setup_path, options_, status, system_level);
172 } 171 }
173 } 172 }
174 173
175 } // namespace installer 174 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/util/installer_state.cc ('k') | chrome/installer/util/shell_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698