Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

chrome/browser/renderer_host/render_widget_host_view_gtk.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_
 #pragma once
 
 #include <gdk/gdk.h>
 
 #include <vector>
 #include <string>
 
 #include "app/animation_delegate.h"
 #include "app/slide_animation.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/gtk/owned_widget_gtk.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
-#include "webkit/glue/plugins/gtk_plugin_container_manager.h"
 #include "webkit/glue/webcursor.h"
+#include "webkit/plugins/npapi/gtk_plugin_container_manager.h"
 
 class RenderWidgetHost;
 class GtkIMContextWrapper;
 class GtkKeyBindingsHandler;
 #if !defined(TOOLKIT_VIEWS)
 class MenuGtk;
 #endif
 struct NativeWebKeyboardEvent;
 
 #if defined(OS_CHROMEOS)
@@ skipping 20 matching lines @@
   // RenderWidgetHostView implementation.
   virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
                            const gfx::Rect& pos);
   virtual void InitAsFullscreen(RenderWidgetHostView* parent_host_view);
   virtual RenderWidgetHost* GetRenderWidgetHost() const;
   virtual void DidBecomeSelected();
   virtual void WasHidden();
   virtual void SetSize(const gfx::Size& size);
   virtual gfx::NativeView GetNativeView();
   virtual void MovePluginWindows(
-      const std::vector<webkit_glue::WebPluginGeometry>& moves);
+      const std::vector<webkit::npapi::WebPluginGeometry>& moves);
   virtual void Focus();
   virtual void Blur();
   virtual bool HasFocus();
   virtual void Show();
   virtual void Hide();
   virtual bool IsShowing();
   virtual gfx::Rect GetViewBounds() const;
   virtual void UpdateCursor(const WebCursor& cursor);
   virtual void SetIsLoading(bool is_loading);
   virtual void ImeUpdateTextInputState(WebKit::WebTextInputType type,
@@ skipping 126 matching lines @@
   bool do_x_grab_;
 
   // A convenience wrapper object for GtkIMContext;
   scoped_ptr<GtkIMContextWrapper> im_context_;
 
   // A convenience object for handling editor key bindings defined in gtk
   // keyboard theme.
   scoped_ptr<GtkKeyBindingsHandler> key_bindings_handler_;
 
   // Helper class that lets us allocate plugin containers and move them.
-  GtkPluginContainerManager plugin_container_manager_;
+  webkit::npapi::GtkPluginContainerManager plugin_container_manager_;
 
   // The size that we want the renderer to be.  We keep this in a separate
   // variable because resizing in GTK+ is async.
   gfx::Size requested_size_;
 
   // The number of times the user has dragged against horizontal edge  of the
   // monitor (if the widget is aligned with that edge). Negative values
   // indicate the left edge, positive the right.
   int dragged_at_horizontal_edge_;
 
   // The number of times the user has dragged against vertical edge  of the
   // monitor (if the widget is aligned with that edge). Negative values
   // indicate the top edge, positive the bottom.
   int dragged_at_vertical_edge_;
 
 #if defined(OS_CHROMEOS)
   // Custimized tooltip window.
   scoped_ptr<views::TooltipWindowGtk> tooltip_window_;
 #endif  // defined(OS_CHROMEOS)
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_