diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 22:23:10 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 22:23:10 +0000 |
| commit | 118586fd1b8e8a40e22f96dede6aef21d2101a65 (patch) | |
| tree | 50b2552fcfbd690f5ba47cb1dbbf648a10072241 /webkit/default_plugin/plugin_impl_mac.h | |
| parent | 0d3a07fe3b5ab17fca5bdd3b60a32593ac7ffff1 (diff) | |
| download | chromium_src-118586fd1b8e8a40e22f96dede6aef21d2101a65.zip chromium_src-118586fd1b8e8a40e22f96dede6aef21d2101a65.tar.gz chromium_src-118586fd1b8e8a40e22f96dede6aef21d2101a65.tar.bz2 | |
Part 1 of http://codereview.chromium.org/2079016
BUG=10952
Review URL: http://codereview.chromium.org/2295001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/default_plugin/plugin_impl_mac.h')
| -rw-r--r-- | webkit/default_plugin/plugin_impl_mac.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/webkit/default_plugin/plugin_impl_mac.h b/webkit/default_plugin/plugin_impl_mac.h index 96686a3..dad298e 100644 --- a/webkit/default_plugin/plugin_impl_mac.h +++ b/webkit/default_plugin/plugin_impl_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "third_party/npapi/bindings/npapi.h" #include "gfx/native_widget_types.h" +#include "third_party/npapi/bindings/npapi.h" // Possible plugin installer states. enum PluginInstallerState { @@ -53,7 +53,7 @@ class PluginInstallerImpl { // argv // Pointer to the arguments. // Returns true on success. - bool Initialize(void *module_handle, NPP instance, NPMIMEType mime_type, + bool Initialize(void* module_handle, NPP instance, NPMIMEType mime_type, int16 argc, char* argn[], char* argv[]); // Informs the plugin of its window information. @@ -277,7 +277,8 @@ class PluginInstallerImpl { // Dimensions of the plugin uint32_t width_; uint32_t height_; - DISALLOW_EVIL_CONSTRUCTORS(PluginInstallerImpl); + + DISALLOW_COPY_AND_ASSIGN(PluginInstallerImpl); }; |