diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-14 05:24:44 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-14 05:24:44 +0000 |
| commit | 91d9f3d52a1e55a9938416b258e08d3cc445eae4 (patch) | |
| tree | 41a281011d4ba9e327fb4e167528c99e0faec018 /chrome/browser/ui/webui/flash_ui.cc | |
| parent | 3c8f946c38d15238f5b0793123c06859a8bc2352 (diff) | |
| download | chromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.zip chromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.tar.gz chromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.tar.bz2 | |
Make WebPluginInfo more generic
- To account for pepper plugins, it grows a type field
- move WebPluginInfo from webkit::npapi to webkit:: and move the files as well.
This will allow us to remove hacks to get pepper plugins to load soon
BUG=89248
TEST=none
Review URL: http://codereview.chromium.org/7648017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/flash_ui.cc')
| -rw-r--r-- | chrome/browser/ui/webui/flash_ui.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index 188bf73..a8a2793 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -27,7 +27,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/plugins/npapi/plugin_list.h" -#include "webkit/plugins/npapi/webplugininfo.h" +#include "webkit/plugins/webplugininfo.h" #if defined(OS_WIN) #include "base/win/windows_version.h" @@ -221,7 +221,7 @@ void FlashDOMHandler::MaybeRespondToPage() { AddPair(list, l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_OS), os_label); // Obtain the version of the Flash plugins. - std::vector<webkit::npapi::WebPluginInfo> info_array; + std::vector<webkit::WebPluginInfo> info_array; webkit::npapi::PluginList::Singleton()->GetPluginInfoArray( GURL(), "application/x-shockwave-flash", false, NULL, &info_array, NULL); string16 flash_version; @@ -229,7 +229,7 @@ void FlashDOMHandler::MaybeRespondToPage() { AddPair(list, ASCIIToUTF16("Flash plugin"), "Disabled"); } else { for (size_t i = 0; i < info_array.size(); ++i) { - if (webkit::npapi::IsPluginEnabled(info_array[i])) { + if (webkit::IsPluginEnabled(info_array[i])) { flash_version = info_array[i].version + ASCIIToUTF16(" ") + info_array[i].path.LossyDisplayName(); if (i != 0) |