Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 124 matching lines @@
     HWND parent =
         widget->GetNativeView()->GetRootWindow()->GetAcceleratedWidget();
     SetParent(window, parent);
   }
   return TRUE;
 }
 
 struct CutoutRectsParams {
   RenderWidgetHostViewAura* widget;
   std::vector<gfx::Rect> cutout_rects;
-  std::map<HWND, webkit::npapi::WebPluginGeometry>* geometry;
+  std::map<HWND, WebPluginGeometry>* geometry;
 };
 
 // Used to update the region for the windowed plugin to draw in. We start with
 // the clip rect from the renderer, then remove the cutout rects from the
 // renderer, and then remove the transient windows from the root window and the
 // constrained windows from the parent window.
 BOOL CALLBACK SetCutoutRectsCallback(HWND window, LPARAM param) {
   CutoutRectsParams* params = reinterpret_cast<CutoutRectsParams*>(param);
 
   if (GetProp(window, kWidgetOwnerProperty) == params->widget) {
     // First calculate the offset of this plugin from the root window, since
     // the cutouts are relative to the root window.
     HWND parent = params->widget->GetNativeView()->GetRootWindow()->
         GetAcceleratedWidget();
     POINT offset;
     offset.x = offset.y = 0;
     MapWindowPoints(window, parent, &offset, 1);
 
     // Now get the cached clip rect and cutouts for this plugin window that came
     // from the renderer.
-    std::map<HWND, webkit::npapi::WebPluginGeometry>::iterator i =
-        params->geometry->begin();
+    std::map<HWND, WebPluginGeometry>::iterator i = params->geometry->begin();
     while (i != params->geometry->end() &&
            i->second.window != window &&
            GetParent(i->second.window) != window) {
       ++i;
     }
 
     if (i == params->geometry->end()) {
       NOTREACHED();
       return TRUE;
     }
@@ skipping 691 matching lines @@
 #else
   manager = BrowserAccessibilityManager::Create(AccessibilityNodeData(), this);
 #endif
 
   SetBrowserAccessibilityManager(manager);
   return manager;
 }
 
 void RenderWidgetHostViewAura::MovePluginWindows(
     const gfx::Vector2d& scroll_offset,
-    const std::vector<webkit::npapi::WebPluginGeometry>& plugin_window_moves) {
+    const std::vector<WebPluginGeometry>& plugin_window_moves) {
 #if defined(OS_WIN)
   // We need to clip the rectangle to the tab's viewport, otherwise we will draw
   // over the browser UI.
   if (!window_->GetRootWindow()) {
     DCHECK(plugin_window_moves.empty());
     return;
   }
   HWND parent = window_->GetRootWindow()->GetAcceleratedWidget();
   gfx::Rect view_bounds = window_->GetBoundsInRootWindow();
-  std::vector<webkit::npapi::WebPluginGeometry> moves = plugin_window_moves;
+  std::vector<WebPluginGeometry> moves = plugin_window_moves;
 
   gfx::Rect view_port(scroll_offset.x(), scroll_offset.y(), view_bounds.width(),
                       view_bounds.height());
 
   for (size_t i = 0; i < moves.size(); ++i) {
     gfx::Rect clip(moves[i].clip_rect);
     gfx::Vector2d view_port_offset(
         moves[i].window_rect.OffsetFromOrigin() + scroll_offset);
     clip.Offset(view_port_offset);
     clip.Intersect(view_port);
@@ skipping 2214 matching lines @@
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content