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

chrome/browser/renderer_host/render_widget_host_view.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_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_
 #pragma once
 
 #if defined(OS_MACOSX)
 #include <OpenGL/OpenGL.h>
@@ skipping 21 matching lines @@
 
 class BackingStore;
 class RenderProcessHost;
 class RenderWidgetHost;
 class WebCursor;
 struct NativeWebKeyboardEvent;
 struct ViewHostMsg_AccessibilityNotification_Params;
 
 namespace webkit_glue {
 struct WebAccessibility;
-}
-
-namespace webkit {
-namespace npapi {
 struct WebPluginGeometry;
 }
-}
 
 // RenderWidgetHostView is an interface implemented by an object that acts as
 // the "View" portion of a RenderWidgetHost. The RenderWidgetHost and its
 // associated RenderProcessHost own the "Model" in this case which is the
 // child renderer process. The View is responsible for receiving events from
 // the surrounding environment and passing them to the RenderWidgetHost, and
 // for actually displaying the content of the RenderWidgetHost when it
 // changes.
 class RenderWidgetHostView {
  public:
@@ skipping 36 matching lines @@
 
   // Tells the View to size itself to the specified size.
   virtual void SetSize(const gfx::Size& size) = 0;
 
   // Retrieves the native view used to contain plugins and identify the
   // renderer in IPC messages.
   virtual gfx::NativeView GetNativeView() = 0;
 
   // Moves all plugin windows as described in the given list.
   virtual void MovePluginWindows(
-      const std::vector<webkit::npapi::WebPluginGeometry>& moves) = 0;
+      const std::vector<webkit_glue::WebPluginGeometry>& moves) = 0;
 
   // Actually set/take focus to/from the associated View component.
   virtual void Focus() = 0;
   virtual void Blur() = 0;
 
   // Returns true if the View currently has the focus.
   virtual bool HasFocus() = 0;
 
   // Shows/hides the view.  These must always be called together in pairs.
   // It is not legal to call Hide() multiple times in a row.
@@ skipping 193 matching lines @@
 
   // The current reserved area in view coordinates where contents should not be
   // rendered to draw the resize corner, sidebar mini tabs etc.
   gfx::Rect reserved_rect_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostView);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_