| 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 23 matching lines...) Expand all Loading... |
| 34 #include "content/public/browser/web_ui_data_source.h" | 34 #include "content/public/browser/web_ui_data_source.h" |
| 35 #include "content/public/browser/web_ui_message_handler.h" | 35 #include "content/public/browser/web_ui_message_handler.h" |
| 36 #include "content/public/common/content_constants.h" | 36 #include "content/public/common/content_constants.h" |
| 37 #include "content/public/common/webplugininfo.h" | 37 #include "content/public/common/webplugininfo.h" |
| 38 #include "gpu/config/gpu_info.h" | 38 #include "gpu/config/gpu_info.h" |
| 39 #include "grit/browser_resources.h" | 39 #include "grit/browser_resources.h" |
| 40 #include "grit/chromium_strings.h" | 40 #include "grit/chromium_strings.h" |
| 41 #include "grit/generated_resources.h" | 41 #include "grit/generated_resources.h" |
| 42 #include "grit/theme_resources.h" | 42 #include "grit/theme_resources.h" |
| 43 #include "ui/base/l10n/l10n_util.h" | 43 #include "ui/base/l10n/l10n_util.h" |
| 44 #include "ui/base/resource/resource_bundle.h" | |
| 45 | 44 |
| 46 #if defined(OS_WIN) | 45 #if defined(OS_WIN) |
| 47 #include "base/win/windows_version.h" | 46 #include "base/win/windows_version.h" |
| 48 #endif | 47 #endif |
| 49 | 48 |
| 50 using base::ASCIIToUTF16; | 49 using base::ASCIIToUTF16; |
| 51 using base::UserMetricsAction; | 50 using base::UserMetricsAction; |
| 52 using content::GpuDataManager; | 51 using content::GpuDataManager; |
| 53 using content::PluginService; | 52 using content::PluginService; |
| 54 using content::WebContents; | 53 using content::WebContents; |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 Profile* profile = Profile::FromWebUI(web_ui); | 393 Profile* profile = Profile::FromWebUI(web_ui); |
| 395 content::WebUIDataSource::Add(profile, CreateFlashUIHTMLSource()); | 394 content::WebUIDataSource::Add(profile, CreateFlashUIHTMLSource()); |
| 396 } | 395 } |
| 397 | 396 |
| 398 // static | 397 // static |
| 399 base::RefCountedMemory* FlashUI::GetFaviconResourceBytes( | 398 base::RefCountedMemory* FlashUI::GetFaviconResourceBytes( |
| 400 ui::ScaleFactor scale_factor) { | 399 ui::ScaleFactor scale_factor) { |
| 401 // Use the default icon for now. | 400 // Use the default icon for now. |
| 402 return NULL; | 401 return NULL; |
| 403 } | 402 } |
| OLD | NEW |