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

Unified Diff: chrome/app/breakpad_linux.cc

Issue 173020: Make Mac first run store sentinel in Profile directory. (Closed)
Patch Set: spelling Created 11 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/first_run.cc » ('j') | chrome/browser/first_run.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/breakpad_linux.cc
diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc
index 19c82bab4742f4007ce0457ccee32062cb4451b0..ec8224e31677984e280465d8435513f2302a2207 100644
--- a/chrome/app/breakpad_linux.cc
+++ b/chrome/app/breakpad_linux.cc
@@ -472,7 +472,7 @@ pid_t UploadCrashDump(const BreakpadInfo& info) {
// static string containing the user's unique GUID. We send this in the crash
// report.
namespace google_update {
-extern std::string linux_guid;
+extern std::string posix_guid;
}
// This is defined in base/linux_util.cc, it's the static string containing the
@@ -508,8 +508,8 @@ static bool CrashDone(const char* dump_path,
info.process_type_length = 7;
info.crash_url = NULL;
info.crash_url_length = 0;
- info.guid = google_update::linux_guid.data();
- info.guid_length = google_update::linux_guid.length();
+ info.guid = google_update::posix_guid.data();
+ info.guid_length = google_update::posix_guid.length();
info.distro = base::linux_distro.data();
info.distro_length = base::linux_distro.length();
UploadCrashDump(info);
@@ -540,13 +540,13 @@ RendererCrashHandler(const void* crash_context, size_t crash_context_size,
char guid[kGuidSize] = {0};
char crash_url[kMaxActiveURLSize + 1] = {0};
char distro[kDistroSize + 1] = {0};
- const size_t guid_len = std::min(google_update::linux_guid.size(),
+ const size_t guid_len = std::min(google_update::posix_guid.size(),
kGuidSize);
const size_t crash_url_len =
std::min(child_process_logging::active_url.size(), kMaxActiveURLSize);
const size_t distro_len =
std::min(base::linux_distro.size(), kDistroSize);
- memcpy(guid, google_update::linux_guid.data(), guid_len);
+ memcpy(guid, google_update::posix_guid.data(), guid_len);
memcpy(crash_url, child_process_logging::active_url.data(), crash_url_len);
memcpy(distro, base::linux_distro.data(), distro_len);
@@ -618,10 +618,10 @@ void InitCrashReporter() {
parsed_command_line.GetSwitchValue(switches::kEnableCrashReporter));
size_t separator = switch_value.find(",");
if (separator != std::string::npos) {
- google_update::linux_guid = switch_value.substr(0, separator);
+ google_update::posix_guid = switch_value.substr(0, separator);
base::linux_distro = switch_value.substr(separator + 1);
} else {
- google_update::linux_guid = switch_value;
+ google_update::posix_guid = switch_value;
}
EnableRendererCrashDumping();
}
« no previous file with comments | « no previous file | chrome/browser/first_run.cc » ('j') | chrome/browser/first_run.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698