From 06a07d94f8b33645f18b3bc3d67be6d8aeb158fa Mon Sep 17 00:00:00 2001 From: "teravest@chromium.org" Date: Thu, 31 Jan 2013 22:37:55 +0000 Subject: Refactor: Simplify WaitableEventWatcher. This change uses a callback instead of a delegate for specifying what should be called when a WaitableEvent occurs. This simplifies the class and gets rid of a workaround internal to the class to prevent name collision on "Delegate" inner classes. Tested (on linux and windows): ninja -C out/Debug chrome out/Debug/base_unittests --gtest_filter=*WaitableEventWatcherTest* BUG= Review URL: https://chromiumcodereview.appspot.com/11953112 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179987 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/plugin_service_impl.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'content/browser/plugin_service_impl.h') diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index 8808c4b..81ef427 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -64,8 +64,7 @@ struct PluginServiceFilterParams { }; class CONTENT_EXPORT PluginServiceImpl - : NON_EXPORTED_BASE(public PluginService), - public base::WaitableEventWatcher::Delegate { + : NON_EXPORTED_BASE(public PluginService) { public: // Returns the PluginServiceImpl singleton. static PluginServiceImpl* GetInstance(); @@ -157,9 +156,7 @@ class CONTENT_EXPORT PluginServiceImpl PluginServiceImpl(); virtual ~PluginServiceImpl(); - // base::WaitableEventWatcher::Delegate implementation. - virtual void OnWaitableEventSignaled( - base::WaitableEvent* waitable_event) OVERRIDE; + void OnWaitableEventSignaled(base::WaitableEvent* waitable_event); // Returns the plugin process host corresponding to the plugin process that // has been started by this service. Returns NULL if no process has been -- cgit v1.1