Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3868)

Unified Diff: chrome/default_plugin/plugin_main.cc

Issue 2813047: Move default_plugin from webkit/ to chrome/ (Closed)
Patch Set: fix windows? Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/default_plugin/plugin_main.h ('k') | chrome/default_plugin/plugins.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « chrome/default_plugin/plugin_main.h ('k') | chrome/default_plugin/plugins.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698