diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 09:16:56 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 09:16:56 +0000 |
| commit | c3cdc73805b33ceab93b95683266ad40b71a8657 (patch) | |
| tree | b40da3b0d163e02082a8ffdafa05ee9af7545a29 /content/browser/plugin_data_remover_impl.cc | |
| parent | ef4fc8012c297b21bdb5dd18c67651475dacd772 (diff) | |
| download | chromium_src-c3cdc73805b33ceab93b95683266ad40b71a8657.zip chromium_src-c3cdc73805b33ceab93b95683266ad40b71a8657.tar.gz chromium_src-c3cdc73805b33ceab93b95683266ad40b71a8657.tar.bz2 | |
Exclude content/plugin/ when plugins are disabled.
- Also exclude plugin_data_remover_impl from the build.
BUG=162667
Review URL: https://chromiumcodereview.appspot.com/11475007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_data_remover_impl.cc')
| -rw-r--r-- | content/browser/plugin_data_remover_impl.cc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc index 679b9ac..76043db 100644 --- a/content/browser/plugin_data_remover_impl.cc +++ b/content/browser/plugin_data_remover_impl.cc @@ -20,13 +20,10 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/pepper_plugin_info.h" +#include "ppapi/proxy/ppapi_messages.h" #include "webkit/plugins/npapi/plugin_utils.h" #include "webkit/plugins/plugin_constants.h" -#if defined(ENABLE_PLUGINS) -#include "ppapi/proxy/ppapi_messages.h" -#endif - namespace content { namespace { @@ -181,10 +178,8 @@ class PluginDataRemoverImpl::Context IPC_BEGIN_MESSAGE_MAP(Context, message) IPC_MESSAGE_HANDLER(PluginHostMsg_ClearSiteDataResult, OnClearSiteDataResult) -#if defined(ENABLE_PLUGINS) IPC_MESSAGE_HANDLER(PpapiHostMsg_ClearSiteDataResult, OnPpapiClearSiteDataResult) -#endif IPC_MESSAGE_UNHANDLED_ERROR() IPC_END_MESSAGE_MAP() @@ -205,7 +200,6 @@ class PluginDataRemoverImpl::Context friend class base::DeleteHelper<Context>; virtual ~Context() {} -#if defined(ENABLE_PLUGINS) IPC::Message* CreatePpapiClearSiteDataMsg(uint64 max_age) { FilePath profile_path = PepperFileMessageFilter::GetDataDirName(browser_context_path_); @@ -222,13 +216,6 @@ class PluginDataRemoverImpl::Context return new PpapiMsg_ClearSiteData(0u, plugin_data_path, std::string(), kClearAllData, max_age); } -#else - IPC::Message* CreatePpapiClearSiteDataMsg(uint64 max_age) { - NOTREACHED() << "CreatePpapiClearSiteDataMsg called with " - << "ENABLE_PLUGINS undefined."; - return NULL; - } -#endif // defined(ENABLE_PLUGINS) // Connects the client side of a newly opened plug-in channel. void ConnectToChannel(const IPC::ChannelHandle& handle, bool is_ppapi) { |