| Index: chrome/default_plugin/plugin_main.cc
|
| diff --git a/webkit/default_plugin/plugin_main.cc b/chrome/default_plugin/plugin_main.cc
|
| similarity index 98%
|
| rename from webkit/default_plugin/plugin_main.cc
|
| rename to chrome/default_plugin/plugin_main.cc
|
| index 16f0f6b1a10d20d95681c644ca2ba6593407892a..2e5b80882afc7e24e7d3579ebcac50b2a2997961 100644
|
| --- a/webkit/default_plugin/plugin_main.cc
|
| +++ b/chrome/default_plugin/plugin_main.cc
|
| @@ -2,11 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/default_plugin/plugin_main.h"
|
| +#include "chrome/default_plugin/plugin_main.h"
|
|
|
| #include "base/logging.h"
|
| #include "base/string_util.h"
|
| -#include "webkit/default_plugin/plugin_impl.h"
|
| +#include "chrome/default_plugin/plugin_impl.h"
|
| #include "webkit/glue/webkit_glue.h"
|
|
|
| namespace default_plugin {
|
| @@ -158,8 +158,8 @@ bool NegotiateModels(NPP instance) {
|
| return true;
|
| }
|
|
|
| -NPError NPP_New(NPMIMEType plugin_type, NPP instance, uint16_t mode, int16_t argc,
|
| - char* argn[], char* argv[], NPSavedData* saved) {
|
| +NPError NPP_New(NPMIMEType plugin_type, NPP instance, uint16_t mode,
|
| + int16_t argc, char* argn[], char* argv[], NPSavedData* saved) {
|
| if (instance == NULL)
|
| return NPERR_INVALID_INSTANCE_ERROR;
|
|
|
|
|