From 1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf Mon Sep 17 00:00:00 2001 From: "maruel@google.com" <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Date: Fri, 15 Aug 2008 12:27:03 +0000 Subject: Large patch set (159 files total) to cleanup the includes. - Slightly reduce the size of the generated .lib files ~3%. - Reduce the number of implicit and explicit atl and windows includes. hooray! - Help incremental build by reducing the number of unnecessary included files. - Split some template class in two, one base class for the common code and the specialization that inherits from the base class. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@937 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/chrome_plugin_lib.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'chrome/common/chrome_plugin_lib.h') diff --git a/chrome/common/chrome_plugin_lib.h b/chrome/common/chrome_plugin_lib.h index 287eb1e..b52c63f 100644 --- a/chrome/common/chrome_plugin_lib.h +++ b/chrome/common/chrome_plugin_lib.h @@ -27,8 +27,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef CHROME_COMMON_CHROME_PLUGIN_LIB_H__ -#define CHROME_COMMON_CHROME_PLUGIN_LIB_H__ +#ifndef CHROME_COMMON_CHROME_PLUGIN_LIB_H_ +#define CHROME_COMMON_CHROME_PLUGIN_LIB_H_ #include <hash_map> #include <string> @@ -68,11 +68,7 @@ class ChromePluginLib : public base::RefCounted<ChromePluginLib> { const bool is_loaded() const { return initialized_; } // Get the Plugin's function pointer table. - const CPPluginFuncs& functions() const { - DCHECK(initialized_); - DCHECK(IsPluginThread()); - return plugin_funcs_; - } + const CPPluginFuncs& functions() const; CPID cpid() { return reinterpret_cast<CPID>(this); } @@ -121,7 +117,7 @@ class ChromePluginLib : public base::RefCounted<ChromePluginLib> { typedef int (STDCALL *CP_TestFunc)(void*); CP_TestFunc CP_Test_; - DISALLOW_EVIL_CONSTRUCTORS(ChromePluginLib); + DISALLOW_COPY_AND_ASSIGN(ChromePluginLib); }; -#endif // CHROME_COMMON_CHROME_PLUGIN_LIB_H__ +#endif // CHROME_COMMON_CHROME_PLUGIN_LIB_H_ -- cgit v1.1