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

Unified Diff: content/child/npapi/plugin_instance.cc

Issue 19761007: Move NPAPI implementation out of webkit/plugins/npapi and into content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 7 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
Index: content/child/npapi/plugin_instance.cc
===================================================================
--- content/child/npapi/plugin_instance.cc (revision 0)
+++ content/child/npapi/plugin_instance.cc (working copy)
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/plugins/npapi/plugin_instance.h"
+#include "content/child/npapi/plugin_instance.h"
#include "base/bind.h"
#include "base/file_util.h"
@@ -10,21 +10,20 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
+#include "content/child/npapi/plugin_host.h"
+#include "content/child/npapi/plugin_lib.h"
+#include "content/child/npapi/plugin_stream_url.h"
+#include "content/child/npapi/plugin_string_stream.h"
+#include "content/child/npapi/webplugin.h"
+#include "content/child/npapi/webplugin_delegate.h"
#include "net/base/escape.h"
-#include "webkit/plugins/npapi/plugin_host.h"
-#include "webkit/plugins/npapi/plugin_lib.h"
-#include "webkit/plugins/npapi/plugin_stream_url.h"
-#include "webkit/plugins/npapi/plugin_string_stream.h"
-#include "webkit/plugins/npapi/webplugin.h"
-#include "webkit/plugins/npapi/webplugin_delegate.h"
#include "webkit/plugins/plugin_constants.h"
#if defined(OS_MACOSX)
#include <ApplicationServices/ApplicationServices.h>
#endif
-namespace webkit {
-namespace npapi {
+namespace content {
PluginInstance::PluginInstance(PluginLib* plugin, const std::string& mime_type)
: plugin_(plugin),
@@ -685,5 +684,4 @@
}
}
-} // namespace npapi
-} // namespace webkit
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698