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

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

Issue 2487783002: Make Crashpad use the user data dir, rather than always default location (Closed)
Patch Set: . Created 4 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
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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 base::string16 ap_value; 231 base::string16 ap_value;
232 // If we fail to read the ap key, send up "&ap=" anyway to indicate 232 // If we fail to read the ap key, send up "&ap=" anyway to indicate
233 // that this was probably a stable channel release. 233 // that this was probably a stable channel release.
234 client_state_key.ReadValue(google_update::kRegApField, &ap_value); 234 client_state_key.ReadValue(google_update::kRegApField, &ap_value);
235 result.append(google_update::kRegApField); 235 result.append(google_update::kRegApField);
236 result.append(L"="); 236 result.append(L"=");
237 result.append(ap_value); 237 result.append(ap_value);
238 238
239 // Crash client id. 239 // Crash client id.
240 base::string16 crash_dump_location; 240 base::string16 crash_dump_location;
241 if (install_static::GetDefaultCrashDumpLocation(&crash_dump_location)) { 241 if (install_static::GetCrashDumpLocation(&crash_dump_location)) {
242 base::FilePath crash_dir = base::FilePath(crash_dump_location); 242 base::FilePath crash_dir = base::FilePath(crash_dump_location);
243 crashpad::UUID client_id; 243 crashpad::UUID client_id;
244 std::unique_ptr<crashpad::CrashReportDatabase> database( 244 std::unique_ptr<crashpad::CrashReportDatabase> database(
245 crashpad::CrashReportDatabase::InitializeWithoutCreating(crash_dir)); 245 crashpad::CrashReportDatabase::InitializeWithoutCreating(crash_dir));
246 if (database && database->GetSettings()->GetClientID(&client_id)) 246 if (database && database->GetSettings()->GetClientID(&client_id))
247 result.append(L"&crash_client_id=").append(client_id.ToString16()); 247 result.append(L"&crash_client_id=").append(client_id.ToString16());
248 } 248 }
249 249
250 return result; 250 return result;
251 } 251 }
(...skipping 27 matching lines...) Expand all
279 GetAppGuid()); 279 GetAppGuid());
280 } 280 }
281 281
282 bool GoogleChromeDistribution::ShouldSetExperimentLabels() { 282 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
283 return true; 283 return true;
284 } 284 }
285 285
286 bool GoogleChromeDistribution::HasUserExperiments() { 286 bool GoogleChromeDistribution::HasUserExperiments() {
287 return true; 287 return true;
288 } 288 }
OLDNEW
« chrome/install_static/policy_path_parser.cc ('K') | « chrome/install_static/policy_path_parser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698