| 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/flash_ui.h" | 5 #include "chrome/browser/ui/webui/flash_ui.h" |
| 6 | 6 |
| 7 #include "base/i18n/time_formatting.h" | 7 #include "base/i18n/time_formatting.h" |
| 8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "base/stringprintf.h" |
| 9 #include "base/threading/thread_restrictions.h" | 10 #include "base/threading/thread_restrictions.h" |
| 10 #include "base/timer.h" | 11 #include "base/timer.h" |
| 11 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 12 #include "base/values.h" | 13 #include "base/values.h" |
| 13 #include "chrome/browser/crash_upload_list.h" | 14 #include "chrome/browser/crash_upload_list.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" | 16 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" |
| 16 #include "chrome/browser/ui/webui/crashes_ui.h" | 17 #include "chrome/browser/ui/webui/crashes_ui.h" |
| 17 #include "chrome/common/chrome_version_info.h" | 18 #include "chrome/common/chrome_version_info.h" |
| 18 #include "chrome/common/jstemplate_builder.h" | 19 #include "chrome/common/jstemplate_builder.h" |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 // Set up the about:flash source. | 334 // Set up the about:flash source. |
| 334 Profile* profile = Profile::FromBrowserContext(contents->browser_context()); | 335 Profile* profile = Profile::FromBrowserContext(contents->browser_context()); |
| 335 profile->GetChromeURLDataManager()->AddDataSource(CreateFlashUIHTMLSource()); | 336 profile->GetChromeURLDataManager()->AddDataSource(CreateFlashUIHTMLSource()); |
| 336 } | 337 } |
| 337 | 338 |
| 338 // static | 339 // static |
| 339 RefCountedMemory* FlashUI::GetFaviconResourceBytes() { | 340 RefCountedMemory* FlashUI::GetFaviconResourceBytes() { |
| 340 // Use the default icon for now. | 341 // Use the default icon for now. |
| 341 return NULL; | 342 return NULL; |
| 342 } | 343 } |
| OLD | NEW |