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

Unified Diff: content/browser/renderer_host/gtk_plugin_container_manager.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/browser/renderer_host/gtk_plugin_container_manager.cc
===================================================================
--- content/browser/renderer_host/gtk_plugin_container_manager.cc (revision 212369)
+++ content/browser/renderer_host/gtk_plugin_container_manager.cc (working copy)
@@ -2,18 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/plugins/npapi/gtk_plugin_container_manager.h"
+#include "content/browser/renderer_host/gtk_plugin_container_manager.h"
#include <gtk/gtk.h>
#include "base/logging.h"
+#include "content/browser/renderer_host/gtk_plugin_container.h"
+#include "content/common/webplugin_geometry.h"
#include "ui/base/gtk/gtk_compat.h"
#include "ui/gfx/gtk_util.h"
-#include "webkit/plugins/npapi/gtk_plugin_container.h"
-#include "webkit/plugins/npapi/webplugin.h"
-namespace webkit {
-namespace npapi {
+namespace content {
GtkPluginContainerManager::GtkPluginContainerManager() : host_widget_(NULL) {}
@@ -159,5 +158,4 @@
gtk_socket_add_id(GTK_SOCKET(widget), id);
}
-} // namespace npapi
-} // namespace webkit
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698