summaryrefslogtreecommitdiffstats
path: root/content/browser/plugin_service_impl.h
diff options
context:
space:
mode:
authorteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 22:37:55 +0000
committerteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 22:37:55 +0000
commit06a07d94f8b33645f18b3bc3d67be6d8aeb158fa (patch)
tree4352c7d41eda55a73785d4ac9fac1e5d44f49e33 /content/browser/plugin_service_impl.h
parentc462b22f1f644cc17568c4bd6f095bb89e5586a7 (diff)
downloadchromium_src-06a07d94f8b33645f18b3bc3d67be6d8aeb158fa.zip
chromium_src-06a07d94f8b33645f18b3bc3d67be6d8aeb158fa.tar.gz
chromium_src-06a07d94f8b33645f18b3bc3d67be6d8aeb158fa.tar.bz2
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
Diffstat (limited to 'content/browser/plugin_service_impl.h')
-rw-r--r--content/browser/plugin_service_impl.h7
1 files changed, 2 insertions, 5 deletions
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