| Index: chrome/browser/ui/webui/flash_ui.cc
|
| diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc
|
| index a456eaf42697938774b56090397103ec5a0eb5c8..bcf7cff36d8492c8aed13ca3fae6edb117ac1b83 100644
|
| --- a/chrome/browser/ui/webui/flash_ui.cc
|
| +++ b/chrome/browser/ui/webui/flash_ui.cc
|
| @@ -26,7 +26,7 @@
|
| #include "grit/theme_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| -#include "webkit/glue/plugins/plugin_list.h"
|
| +#include "webkit/plugins/npapi/plugin_list.h"
|
| #include "webkit/plugins/npapi/webplugininfo.h"
|
|
|
| #if defined(OS_WIN)
|
| @@ -223,7 +223,7 @@ void FlashDOMHandler::MaybeRespondToPage() {
|
| // Obtain the version of the Flash plugins.
|
| std::vector<webkit::npapi::WebPluginInfo> info_array;
|
| webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
|
| - GURL(), "application/x-shockwave-flash", false, &info_array, NULL);
|
| + GURL(), "application/x-shockwave-flash", false, NULL, &info_array, NULL);
|
| string16 flash_version;
|
| if (info_array.empty()) {
|
| AddPair(list, ASCIIToUTF16("Flash plugin"), "Disabled");
|
|
|