diff options
| author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 19:32:42 +0000 |
|---|---|---|
| committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 19:32:42 +0000 |
| commit | 8b73c2e491f6c5d38047963d01b47bb071a96e18 (patch) | |
| tree | f961ce5d2d358bbda8b41f8c6824d4af5bb2c6b2 /content/common | |
| parent | 1300e92e24e90d850e8b12129c1944569a9e9ce8 (diff) | |
| download | chromium_src-8b73c2e491f6c5d38047963d01b47bb071a96e18.zip chromium_src-8b73c2e491f6c5d38047963d01b47bb071a96e18.tar.gz chromium_src-8b73c2e491f6c5d38047963d01b47bb071a96e18.tar.bz2 | |
Revert 171408
> The refactors PPB_Flash_File_ModuleLocal/FileRef to the new resource model. Calls for both these interfaces are now made directly to the browser. This removes the in-process implementation for these interfaces also (as they are flash-only). Tests are added for PPB_Flash_File_ModuleLocal.
>
> Review URL: https://codereview.chromium.org/11359097
TBR=raymes@chromium.org
Review URL: https://codereview.chromium.org/11437038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/all_messages.h | 1 | ||||
| -rw-r--r-- | content/common/pepper_plugin_registry.cc | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/content/common/all_messages.h b/content/common/all_messages.h index 106af5a..b102ec9 100644 --- a/content/common/all_messages.h +++ b/content/common/all_messages.h @@ -9,5 +9,6 @@ // included here. #include "content/common/content_message_generator.h" #if defined(ENABLE_PLUGINS) +#include "ppapi/proxy/pepper_file_messages.h" #include "ppapi/proxy/ppapi_messages.h" #endif diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc index 457ee8f..6db31e7 100644 --- a/content/common/pepper_plugin_registry.cc +++ b/content/common/pepper_plugin_registry.cc @@ -70,10 +70,6 @@ void ComputePluginsFromCommandLine(std::vector<PepperPluginInfo>* plugins) { plugin.mime_types.push_back(mime_type); } - // If the plugin name is empty, use the filename. - if (plugin.name.empty()) - plugin.name = UTF16ToUTF8(plugin.path.BaseName().LossyDisplayName()); - // Command-line plugins get full permissions. plugin.permissions = ppapi::PERMISSION_ALL_BITS; |