From 28b692aeaa6512d1a9ad159346b5c077fb2eb28e Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 18 Nov 2013 18:03:41 +0800 Subject: [PATCH] Always use atom-shell's verion when uploading crash report. --- common/crash_reporter/crash_reporter.cc | 20 ++++---------------- spec/api/crash-reporter.coffee | 2 +- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/common/crash_reporter/crash_reporter.cc b/common/crash_reporter/crash_reporter.cc index 8e63cbf..66b3cc8 100644 --- a/common/crash_reporter/crash_reporter.cc +++ b/common/crash_reporter/crash_reporter.cc @@ -25,21 +25,10 @@ void CrashReporter::Start(std::string product_name, const std::string& submit_url, bool auto_submit, bool skip_system_crash_handler) { - std::string version; - if (is_browser_) { - // Use application's version for crashes in browser. - version = atom::Browser::Get()->GetVersion(); - } else { - // Just use atom-shell's version in renderer, since we can not get - // application's version here. - version = ATOM_VERSION_STRING; - - // Append "Renderer" for the renderer. - product_name += " Renderer"; - } - - InitBreakpad(product_name, version, company_name, submit_url, auto_submit, - skip_system_crash_handler); + // Append "Renderer" for the renderer. + product_name += " Renderer"; + InitBreakpad(product_name, ATOM_VERSION_STRING, company_name, submit_url, + auto_submit, skip_system_crash_handler); } void CrashReporter::SetUploadParameters() { @@ -47,7 +36,6 @@ void CrashReporter::SetUploadParameters() { std::string type = command.GetSwitchValueASCII(switches::kProcessType); upload_parameters_["process_type"] = type; - upload_parameters_["atom_shell_version"] = ATOM_VERSION_STRING; } } // namespace crash_reporter diff --git a/spec/api/crash-reporter.coffee b/spec/api/crash-reporter.coffee index e6ad559..415c2a0 100644 --- a/spec/api/crash-reporter.coffee +++ b/spec/api/crash-reporter.coffee @@ -13,7 +13,7 @@ describe 'crash-reporter module', -> server = http.createServer (req, res) -> form = new formidable.IncomingForm() form.parse req, (error, fields, files) -> - assert.equal fields['atom_shell_version'], process.versions['atom-shell'] + assert.equal fields['ver'], process.versions['atom-shell'] assert.equal fields['process_type'], 'renderer' assert.equal files['upload_file_minidump']['name'], 'minidump.dmp' -- 2.7.4