diff options
| author | bauerb <bauerb@chromium.org> | 2015-04-09 03:23:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-09 10:23:37 +0000 |
| commit | 5ebf3147e3a1e66672354fa0412e3cbf964597bc (patch) | |
| tree | 1cc1b0efd1f25e6dd710ad30014edc8052ebe1d9 | |
| parent | 340539c3c7020d4f0ac66b7bd8879874ce83c469 (diff) | |
| download | chromium_src-5ebf3147e3a1e66672354fa0412e3cbf964597bc.zip chromium_src-5ebf3147e3a1e66672354fa0412e3cbf964597bc.tar.gz chromium_src-5ebf3147e3a1e66672354fa0412e3cbf964597bc.tar.bz2 | |
Receive all messages in PluginObserver from the RenderFrameHost.
BUG=444203
Review URL: https://codereview.chromium.org/1063413002
Cr-Commit-Position: refs/heads/master@{#324407}
| -rw-r--r-- | chrome/browser/plugins/plugin_observer.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/plugins/plugin_observer.h | 1 |
2 files changed, 2 insertions, 12 deletions
diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc index e3808c6..1b56a3f 100644 --- a/chrome/browser/plugins/plugin_observer.cc +++ b/chrome/browser/plugins/plugin_observer.cc @@ -336,17 +336,6 @@ bool PluginObserver::OnMessageReceived( IPC_BEGIN_MESSAGE_MAP(PluginObserver, message) IPC_MESSAGE_HANDLER(ChromeViewHostMsg_BlockedOutdatedPlugin, OnBlockedOutdatedPlugin) - IPC_MESSAGE_HANDLER(ChromeViewHostMsg_NPAPINotSupported, - OnNPAPINotSupported) - - IPC_MESSAGE_UNHANDLED(return false) - IPC_END_MESSAGE_MAP() - - return true; -} - -bool PluginObserver::OnMessageReceived(const IPC::Message& message) { - IPC_BEGIN_MESSAGE_MAP(PluginObserver, message) #if defined(ENABLE_PLUGIN_INSTALLATION) IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RemovePluginPlaceholderHost, OnRemovePluginPlaceholderHost) @@ -355,6 +344,8 @@ bool PluginObserver::OnMessageReceived(const IPC::Message& message) { OnOpenAboutPlugins) IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CouldNotLoadPlugin, OnCouldNotLoadPlugin) + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_NPAPINotSupported, + OnNPAPINotSupported) IPC_MESSAGE_UNHANDLED(return false) IPC_END_MESSAGE_MAP() diff --git a/chrome/browser/plugins/plugin_observer.h b/chrome/browser/plugins/plugin_observer.h index 1e46bd7..240bc7c 100644 --- a/chrome/browser/plugins/plugin_observer.h +++ b/chrome/browser/plugins/plugin_observer.h @@ -42,7 +42,6 @@ class PluginObserver : public content::WebContentsObserver, base::ProcessId plugin_pid) override; bool OnMessageReceived(const IPC::Message& message, content::RenderFrameHost* render_frame_host) override; - bool OnMessageReceived(const IPC::Message& message) override; private: explicit PluginObserver(content::WebContents* web_contents); |