OLD | NEW |
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/browser/feedback/feedback_data.h" | 5 #include "chrome/browser/feedback/feedback_data.h" |
6 | 6 |
7 #include "base/json/json_string_value_serializer.h" | 7 #include "base/json/json_string_value_serializer.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/chromeos/settings/cros_settings.h" | 10 #include "chrome/browser/chromeos/settings/cros_settings.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 details->Erase(it, NULL); | 53 details->Erase(it, NULL); |
54 break; | 54 break; |
55 } | 55 } |
56 } | 56 } |
57 } | 57 } |
58 | 58 |
59 // Add sync logs to logs. | 59 // Add sync logs to logs. |
60 std::string sync_logs_string; | 60 std::string sync_logs_string; |
61 JSONStringValueSerializer serializer(&sync_logs_string); | 61 JSONStringValueSerializer serializer(&sync_logs_string); |
62 serializer.Serialize(*sync_logs.get()); | 62 serializer.Serialize(*sync_logs.get()); |
63 (*logs)[kSyncDataKey] = sync_logs_string; | 63 (*logs)[chrome::kSyncDataKey] = sync_logs_string; |
64 } | 64 } |
65 | 65 |
66 void AddExtensionInfoLogs(chromeos::system::LogDictionaryType* logs) { | 66 void AddExtensionInfoLogs(chromeos::system::LogDictionaryType* logs) { |
67 bool reporting_enabled = false; | 67 bool reporting_enabled = false; |
68 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, | 68 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, |
69 &reporting_enabled); | 69 &reporting_enabled); |
70 if (!reporting_enabled) | 70 if (!reporting_enabled) |
71 return; | 71 return; |
72 | 72 |
73 Profile* default_profile = | 73 Profile* default_profile = |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 zip_content_ = zip_content; | 220 zip_content_ = zip_content; |
221 sys_info_ = logs; | 221 sys_info_ = logs; |
222 | 222 |
223 if (send_sys_info_) { | 223 if (send_sys_info_) { |
224 // We already prepared the report, send it now. | 224 // We already prepared the report, send it now. |
225 this->SendReport(); | 225 this->SendReport(); |
226 } | 226 } |
227 } | 227 } |
228 } | 228 } |
229 #endif | 229 #endif |
OLD | NEW |