diff options
| author | dyen@chromium.org <dyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-02 01:30:05 +0000 |
|---|---|---|
| committer | dyen@chromium.org <dyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-02 01:30:05 +0000 |
| commit | 690117c4a57385facafbbe1c056e7bc3aa319981 (patch) | |
| tree | dae0611051ab03eba764db3146d793498923a804 /chrome/browser/plugins | |
| parent | 7dbf0b21420dc959177c4760e3a4292b38da48ae (diff) | |
| download | chromium_src-690117c4a57385facafbbe1c056e7bc3aa319981.zip chromium_src-690117c4a57385facafbbe1c056e7bc3aa319981.tar.gz chromium_src-690117c4a57385facafbbe1c056e7bc3aa319981.tar.bz2 | |
Fix compilation error when ENABLE_PEPPER_CDMS is not defined.
It looks like the following CL #ifdefed out declarations:
https://src.chromium.org/viewvc/chrome?view=rev&revision=278993
However, a message handler that is no longer declared is
still being used. This causes problems when ENABLE_PEPPER_CDMS
is not defined.
R=thestig@chromium.org
BUG=None
TEST= trybots
Review URL: https://codereview.chromium.org/362043002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugins')
| -rw-r--r-- | chrome/browser/plugins/plugin_info_message_filter.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/plugins/plugin_info_message_filter.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc index 9aec50d..ac2e82b 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.cc +++ b/chrome/browser/plugins/plugin_info_message_filter.cc @@ -98,9 +98,11 @@ bool PluginInfoMessageFilter::OnMessageReceived(const IPC::Message& message) { IPC_BEGIN_MESSAGE_MAP(PluginInfoMessageFilter, message) IPC_MESSAGE_HANDLER_DELAY_REPLY(ChromeViewHostMsg_GetPluginInfo, OnGetPluginInfo) +#if defined(ENABLE_PEPPER_CDMS) IPC_MESSAGE_HANDLER( ChromeViewHostMsg_IsInternalPluginRegisteredForMimeType, OnIsInternalPluginRegisteredForMimeType) +#endif IPC_MESSAGE_UNHANDLED(return false) IPC_END_MESSAGE_MAP() return true; @@ -168,6 +170,7 @@ void PluginInfoMessageFilter::PluginsLoaded( Send(reply_msg); } +#if defined(ENABLE_PEPPER_CDMS) void PluginInfoMessageFilter::OnIsInternalPluginRegisteredForMimeType( const std::string& mime_type, bool* is_registered, @@ -190,6 +193,7 @@ void PluginInfoMessageFilter::OnIsInternalPluginRegisteredForMimeType( *is_registered = false; } +#endif void PluginInfoMessageFilter::Context::DecidePluginStatus( const GetPluginInfo_Params& params, diff --git a/chrome/browser/plugins/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h index eb8dcb9..c9987c5 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.h +++ b/chrome/browser/plugins/plugin_info_message_filter.h @@ -99,6 +99,7 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter { IPC::Message* reply_msg, const std::vector<content::WebPluginInfo>& plugins); +#if defined(ENABLE_PEPPER_CDMS) // Returns whether any internal plugin supporting |mime_type| is registered. // Does not determine whether the plugin can actually be instantiated // (e.g. whether it is allowed or has all its dependencies). @@ -110,6 +111,7 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter { bool* is_registered, std::vector<base::string16>* additional_param_names, std::vector<base::string16>* additional_param_values); +#endif Context context_; |