| Index: chrome/browser/ui/webui/flash_ui.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/flash_ui.cc (revision 212806)
|
| +++ chrome/browser/ui/webui/flash_ui.cc (working copy)
|
| @@ -33,6 +33,7 @@
|
| #include "content/public/browser/web_ui.h"
|
| #include "content/public/browser/web_ui_data_source.h"
|
| #include "content/public/browser/web_ui_message_handler.h"
|
| +#include "content/public/common/webplugininfo.h"
|
| #include "gpu/config/gpu_info.h"
|
| #include "grit/browser_resources.h"
|
| #include "grit/chromium_strings.h"
|
| @@ -41,7 +42,6 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "webkit/plugins/plugin_constants.h"
|
| -#include "webkit/plugins/webplugininfo.h"
|
|
|
| #if defined(OS_WIN)
|
| #include "base/win/windows_version.h"
|
| @@ -99,7 +99,7 @@
|
| void HandleRequestFlashInfo(const ListValue* args);
|
|
|
| // Callback for the Flash plugin information.
|
| - void OnGotPlugins(const std::vector<webkit::WebPluginInfo>& plugins);
|
| + void OnGotPlugins(const std::vector<content::WebPluginInfo>& plugins);
|
|
|
| private:
|
| // Called when we think we might have enough information to return data back
|
| @@ -203,7 +203,7 @@
|
| }
|
|
|
| void FlashDOMHandler::OnGotPlugins(
|
| - const std::vector<webkit::WebPluginInfo>& plugins) {
|
| + const std::vector<content::WebPluginInfo>& plugins) {
|
| has_plugin_info_ = true;
|
| MaybeRespondToPage();
|
| }
|
| @@ -266,7 +266,7 @@
|
| AddPair(list, l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_OS), os_label);
|
|
|
| // Obtain the version of the Flash plugins.
|
| - std::vector<webkit::WebPluginInfo> info_array;
|
| + std::vector<content::WebPluginInfo> info_array;
|
| PluginService::GetInstance()->GetPluginInfoArray(
|
| GURL(), kFlashPluginSwfMimeType, false, &info_array, NULL);
|
| if (info_array.empty()) {
|
|
|