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

Unified Diff: content/child/npapi/webplugin_delegate_impl_gtk.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/webplugin_delegate_impl_gtk.cc
===================================================================
--- content/child/npapi/webplugin_delegate_impl_gtk.cc (revision 0)
+++ content/child/npapi/webplugin_delegate_impl_gtk.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/webplugin_delegate_impl.h"
+#include "content/child/npapi/webplugin_delegate_impl.h"
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
@@ -11,13 +11,13 @@
#include <vector>
#include "base/metrics/stats_counters.h"
+#include "content/child/npapi/plugin_instance.h"
+#include "content/child/npapi/webplugin.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "ui/base/gtk/gtk_compat.h"
#include "ui/gfx/blit.h"
#include "webkit/common/cursors/webcursor.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/npapi/webplugin.h"
#include "webkit/plugins/plugin_constants.h"
#include "third_party/npapi/bindings/npapi_x11.h"
@@ -26,8 +26,7 @@
using WebKit::WebInputEvent;
using WebKit::WebMouseEvent;
-namespace webkit {
-namespace npapi {
+namespace content {
WebPluginDelegateImpl::WebPluginDelegateImpl(
PluginInstance* instance)
@@ -749,5 +748,4 @@
return ret;
}
-} // namespace npapi
-} // namespace webkit
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698