From 5ea7794d237835197543c63aafe299a77a766fe2 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 30 Jan 2009 21:17:02 +0000 Subject: Random bits of de-Winification for WebContents. Review URL: http://codereview.chromium.org/19721 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8987 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/plugin_service.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'chrome/browser/plugin_service.h') diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h index 3bca25f..d7ad9ae 100644 --- a/chrome/browser/plugin_service.h +++ b/chrome/browser/plugin_service.h @@ -5,8 +5,8 @@ // This class responds to requests from renderers for the list of plugins, and // also a proxy object for plugin instances. -#ifndef CHROME_BROWSER_PLUGIN_SERVICE_H__ -#define CHROME_BROWSER_PLUGIN_SERVICE_H__ +#ifndef CHROME_BROWSER_PLUGIN_SERVICE_H_ +#define CHROME_BROWSER_PLUGIN_SERVICE_H_ #include @@ -141,8 +141,7 @@ class PluginService { Lock lock_; // Handles plugin process shutdown. - class ShutdownHandler : - public base::RefCountedThreadSafe { + class ShutdownHandler : public base::RefCountedThreadSafe { public: ShutdownHandler() {} ~ShutdownHandler() {} @@ -152,16 +151,16 @@ class PluginService { void InitiateShutdown(); private: - // Shutdown handler which runs on the io thread. - void OnShutdown(); + // Shutdown handler which runs on the io thread. + void OnShutdown(); - DISALLOW_EVIL_CONSTRUCTORS(ShutdownHandler); + DISALLOW_COPY_AND_ASSIGN(ShutdownHandler); }; friend class ShutdownHandler; scoped_refptr plugin_shutdown_handler_; - DISALLOW_EVIL_CONSTRUCTORS(PluginService); + DISALLOW_COPY_AND_ASSIGN(PluginService); }; // The PluginProcessHostIterator allows to iterate through all the @@ -214,4 +213,4 @@ class PluginProcessHostIterator { PluginService::PluginMap::const_iterator end_; }; -#endif // CHROME_BROWSER_PLUGIN_SERVICE_H__ +#endif // CHROME_BROWSER_PLUGIN_SERVICE_H_ -- cgit v1.1