| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser/bug_report_data.h" | 5 #include "chrome/browser/bug_report_data.h" |
| 6 | 6 |
| 7 #if defined(OS_CHROMEOS) | 7 #if defined(OS_CHROMEOS) |
| 8 #include "chrome/browser/chromeos/notifications/system_notification.h" | 8 #include "chrome/browser/chromeos/notifications/system_notification.h" |
| 9 #endif | 9 #endif |
| 10 | 10 |
| 11 BugReportData::BugReportData() | 11 BugReportData::BugReportData() |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #if defined(OS_CHROMEOS) | 43 #if defined(OS_CHROMEOS) |
| 44 user_email_ = user_email; | 44 user_email_ = user_email; |
| 45 send_sys_info_ = send_sys_info; | 45 send_sys_info_ = send_sys_info; |
| 46 sent_report_ = sent_report; | 46 sent_report_ = sent_report; |
| 47 #endif | 47 #endif |
| 48 } | 48 } |
| 49 | 49 |
| 50 | 50 |
| 51 #if defined(OS_CHROMEOS) | 51 #if defined(OS_CHROMEOS) |
| 52 // Called from the same thread as HandleGetDialogDefaults, i.e. the UI thread. | 52 // Called from the same thread as HandleGetDialogDefaults, i.e. the UI thread. |
| 53 void BugReportData::SyslogsComplete(chromeos::LogDictionaryType* logs, | 53 void BugReportData::SyslogsComplete(chromeos::system::LogDictionaryType* logs, |
| 54 std::string* zip_content) { | 54 std::string* zip_content) { |
| 55 if (sent_report_) { | 55 if (sent_report_) { |
| 56 // We already sent the report, just delete the data. | 56 // We already sent the report, just delete the data. |
| 57 if (logs) | 57 if (logs) |
| 58 delete logs; | 58 delete logs; |
| 59 if (zip_content) | 59 if (zip_content) |
| 60 delete zip_content; | 60 delete zip_content; |
| 61 } else { | 61 } else { |
| 62 zip_content_ = zip_content; | 62 zip_content_ = zip_content; |
| 63 sys_info_ = logs; // Will get deleted when SendReport() is called. | 63 sys_info_ = logs; // Will get deleted when SendReport() is called. |
| 64 if (send_sys_info_) { | 64 if (send_sys_info_) { |
| 65 // We already prepared the report, send it now. | 65 // We already prepared the report, send it now. |
| 66 this->SendReport(); | 66 this->SendReport(); |
| 67 } | 67 } |
| 68 } | 68 } |
| 69 } | 69 } |
| 70 #endif | 70 #endif |
| OLD | NEW |