Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(515)

Unified Diff: chrome/browser/component_updater/pepper_flash_component_installer.cc

Issue 19894003: Move webplugininfo.h to content/public. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/component_updater/pepper_flash_component_installer.cc
===================================================================
--- chrome/browser/component_updater/pepper_flash_component_installer.cc (revision 212806)
+++ chrome/browser/component_updater/pepper_flash_component_installer.cc (working copy)
@@ -155,18 +155,18 @@
plugin_info->version = flash_version.GetString();
- webkit::WebPluginMimeType swf_mime_type(kFlashPluginSwfMimeType,
- kFlashPluginSwfExtension,
- kFlashPluginName);
+ content::WebPluginMimeType swf_mime_type(kFlashPluginSwfMimeType,
+ kFlashPluginSwfExtension,
+ kFlashPluginName);
plugin_info->mime_types.push_back(swf_mime_type);
- webkit::WebPluginMimeType spl_mime_type(kFlashPluginSplMimeType,
- kFlashPluginSplExtension,
- kFlashPluginName);
+ content::WebPluginMimeType spl_mime_type(kFlashPluginSplMimeType,
+ kFlashPluginSplExtension,
+ kFlashPluginName);
plugin_info->mime_types.push_back(spl_mime_type);
return true;
}
-bool IsPepperFlash(const webkit::WebPluginInfo& plugin) {
+bool IsPepperFlash(const content::WebPluginInfo& plugin) {
// We try to recognize Pepper Flash by the following criteria:
// * It is a Pepper plug-in.
// * It has the special Flash permissions.
@@ -181,9 +181,9 @@
if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info))
return;
- std::vector<webkit::WebPluginInfo> plugins;
+ std::vector<content::WebPluginInfo> plugins;
PluginService::GetInstance()->GetInternalPlugins(&plugins);
- for (std::vector<webkit::WebPluginInfo>::const_iterator it = plugins.begin();
+ for (std::vector<content::WebPluginInfo>::const_iterator it = plugins.begin();
it != plugins.end(); ++it) {
if (!IsPepperFlash(*it))
continue;

Powered by Google App Engine
This is Rietveld 408576698