Index: content/browser/plugin_data_remover_impl.cc |
=================================================================== |
--- content/browser/plugin_data_remover_impl.cc (revision 212806) |
+++ content/browser/plugin_data_remover_impl.cc (working copy) |
@@ -41,16 +41,16 @@ |
// static |
void PluginDataRemover::GetSupportedPlugins( |
- std::vector<webkit::WebPluginInfo>* supported_plugins) { |
+ std::vector<WebPluginInfo>* supported_plugins) { |
bool allow_wildcard = false; |
- std::vector<webkit::WebPluginInfo> plugins; |
+ std::vector<WebPluginInfo> plugins; |
PluginService::GetInstance()->GetPluginInfoArray( |
GURL(), kFlashPluginSwfMimeType, allow_wildcard, &plugins, NULL); |
Version min_version(kMinFlashVersion); |
- for (std::vector<webkit::WebPluginInfo>::iterator it = plugins.begin(); |
+ for (std::vector<WebPluginInfo>::iterator it = plugins.begin(); |
it != plugins.end(); ++it) { |
Version version; |
- webkit::WebPluginInfo::CreateVersionFromString(it->version, &version); |
+ WebPluginInfo::CreateVersionFromString(it->version, &version); |
if (version.IsValid() && min_version.CompareTo(version) == -1) |
supported_plugins->push_back(*it); |
} |
@@ -88,7 +88,7 @@ |
PluginServiceImpl* plugin_service = PluginServiceImpl::GetInstance(); |
// Get the plugin file path. |
- std::vector<webkit::WebPluginInfo> plugins; |
+ std::vector<WebPluginInfo> plugins; |
plugin_service->GetPluginInfoArray( |
GURL(), mime_type, false, &plugins, NULL); |
base::FilePath plugin_path; |
@@ -135,7 +135,7 @@ |
return resource_context_; |
} |
- virtual void SetPluginInfo(const webkit::WebPluginInfo& info) OVERRIDE {} |
+ virtual void SetPluginInfo(const WebPluginInfo& info) OVERRIDE {} |
virtual void OnFoundPluginProcessHost(PluginProcessHost* host) OVERRIDE {} |