OLD | NEW |
1 // Copyright (c) 2011 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/ui/webui/crashes_ui.h" | 5 #include "chrome/browser/ui/webui/crashes_ui.h" |
6 | 6 |
7 #include "base/i18n/time_formatting.h" | 7 #include "base/i18n/time_formatting.h" |
8 #include "base/memory/ref_counted_memory.h" | 8 #include "base/memory/ref_counted_memory.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 for (std::vector<CrashUploadList::CrashInfo>::iterator i = crashes.begin(); | 131 for (std::vector<CrashUploadList::CrashInfo>::iterator i = crashes.begin(); |
132 i != crashes.end(); ++i) { | 132 i != crashes.end(); ++i) { |
133 DictionaryValue* crash = new DictionaryValue(); | 133 DictionaryValue* crash = new DictionaryValue(); |
134 crash->SetString("id", i->crash_id); | 134 crash->SetString("id", i->crash_id); |
135 crash->SetString("time", | 135 crash->SetString("time", |
136 base::TimeFormatFriendlyDateAndTime(i->crash_time)); | 136 base::TimeFormatFriendlyDateAndTime(i->crash_time)); |
137 crash_list.Append(crash); | 137 crash_list.Append(crash); |
138 } | 138 } |
139 } | 139 } |
140 | 140 |
141 FundamentalValue enabled(crash_reporting_enabled); | 141 base::FundamentalValue enabled(crash_reporting_enabled); |
142 | 142 |
143 const chrome::VersionInfo version_info; | 143 const chrome::VersionInfo version_info; |
144 StringValue version(version_info.Version()); | 144 base::StringValue version(version_info.Version()); |
145 | 145 |
146 web_ui_->CallJavascriptFunction("updateCrashList", enabled, crash_list, | 146 web_ui_->CallJavascriptFunction("updateCrashList", enabled, crash_list, |
147 version); | 147 version); |
148 } | 148 } |
149 | 149 |
150 } // namespace | 150 } // namespace |
151 | 151 |
152 /////////////////////////////////////////////////////////////////////////////// | 152 /////////////////////////////////////////////////////////////////////////////// |
153 // | 153 // |
154 // CrashesUI | 154 // CrashesUI |
(...skipping 19 matching lines...) Expand all Loading... |
174 bool CrashesUI::CrashReportingEnabled() { | 174 bool CrashesUI::CrashReportingEnabled() { |
175 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) | 175 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) |
176 PrefService* prefs = g_browser_process->local_state(); | 176 PrefService* prefs = g_browser_process->local_state(); |
177 return prefs->GetBoolean(prefs::kMetricsReportingEnabled); | 177 return prefs->GetBoolean(prefs::kMetricsReportingEnabled); |
178 #elif defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS) | 178 #elif defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS) |
179 return chromeos::UserCrosSettingsProvider::cached_reporting_enabled(); | 179 return chromeos::UserCrosSettingsProvider::cached_reporting_enabled(); |
180 #else | 180 #else |
181 return false; | 181 return false; |
182 #endif | 182 #endif |
183 } | 183 } |
OLD | NEW |