| Index: webkit/default_plugin/plugin_impl_mac.h
|
| diff --git a/webkit/default_plugin/plugin_impl_mac.h b/webkit/default_plugin/plugin_impl_mac.h
|
| index 96686a37671825312e3c08e7d500fd241ca42f49..dad298e592c1757167ffc97472610eb34969c952 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);
|
| };
|
|
|
|
|
|
|