| 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/ui/webui/flash_ui.h" | 5 #include "chrome/browser/ui/webui/flash_ui.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 // Crash information. | 294 // Crash information. |
| 295 AddPair(list, base::string16(), "--- Crash data ---"); | 295 AddPair(list, base::string16(), "--- Crash data ---"); |
| 296 bool crash_reporting_enabled = | 296 bool crash_reporting_enabled = |
| 297 ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(); | 297 ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(); |
| 298 if (crash_reporting_enabled) { | 298 if (crash_reporting_enabled) { |
| 299 std::vector<CrashUploadList::UploadInfo> crashes; | 299 std::vector<CrashUploadList::UploadInfo> crashes; |
| 300 upload_list_->GetUploads(10, &crashes); | 300 upload_list_->GetUploads(10, &crashes); |
| 301 | 301 |
| 302 for (std::vector<CrashUploadList::UploadInfo>::iterator i = crashes.begin(); | 302 for (std::vector<CrashUploadList::UploadInfo>::iterator i = crashes.begin(); |
| 303 i != crashes.end(); ++i) { | 303 i != crashes.end(); ++i) { |
| 304 base::string16 crash_string(ASCIIToUTF16(i->id)); | 304 base::string16 crash_string(ASCIIToUTF16(i->upload_id)); |
| 305 crash_string += ASCIIToUTF16(" "); | 305 crash_string += ASCIIToUTF16(" "); |
| 306 crash_string += base::TimeFormatFriendlyDateAndTime(i->time); | 306 crash_string += base::TimeFormatFriendlyDateAndTime(i->upload_time); |
| 307 AddPair(list, ASCIIToUTF16("crash id"), crash_string); | 307 AddPair(list, ASCIIToUTF16("crash id"), crash_string); |
| 308 } | 308 } |
| 309 } else { | 309 } else { |
| 310 AddPair(list, ASCIIToUTF16("Crash Reporting"), | 310 AddPair(list, ASCIIToUTF16("Crash Reporting"), |
| 311 "Enable crash reporting to see crash IDs"); | 311 "Enable crash reporting to see crash IDs"); |
| 312 AddPair(list, ASCIIToUTF16("For more details"), | 312 AddPair(list, ASCIIToUTF16("For more details"), |
| 313 chrome::kLearnMoreReportingURL); | 313 chrome::kLearnMoreReportingURL); |
| 314 } | 314 } |
| 315 | 315 |
| 316 // GPU information. | 316 // GPU information. |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 389 Profile* profile = Profile::FromWebUI(web_ui); | 389 Profile* profile = Profile::FromWebUI(web_ui); |
| 390 content::WebUIDataSource::Add(profile, CreateFlashUIHTMLSource()); | 390 content::WebUIDataSource::Add(profile, CreateFlashUIHTMLSource()); |
| 391 } | 391 } |
| 392 | 392 |
| 393 // static | 393 // static |
| 394 base::RefCountedMemory* FlashUI::GetFaviconResourceBytes( | 394 base::RefCountedMemory* FlashUI::GetFaviconResourceBytes( |
| 395 ui::ScaleFactor scale_factor) { | 395 ui::ScaleFactor scale_factor) { |
| 396 // Use the default icon for now. | 396 // Use the default icon for now. |
| 397 return NULL; | 397 return NULL; |
| 398 } | 398 } |
| OLD | NEW |