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 |