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

chrome/browser/plugin_carbon_interpose_mac.cc

 // Copyright (c) 2009 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.
 
 #if !defined(__LP64__)
 
 #include <Carbon/Carbon.h>
 
 #include "chrome/plugin/plugin_interpose_util_mac.h"
 #include "gfx/rect.h"
-#include "webkit/plugins/npapi/carbon_plugin_window_tracker_mac.h"
+#include "webkit/glue/plugins/carbon_plugin_window_tracker_mac.h"
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 // Returns true if the given window is modal.
 static bool IsModalWindow(WindowRef window) {
   WindowModality modality = kWindowModalityNone;
   WindowRef modal_target = NULL;
   OSStatus status = GetWindowModality(window, &modality, &modal_target);
   return (status == noErr) && (modality != kWindowModalityNone);
 }
@@ skipping 32 matching lines @@
 static void OnPluginWindowSelected(WindowRef window) {
   mac_plugin_interposing::NotifyBrowserOfPluginSelectWindow(
       HIWindowGetCGWindowID(window), CGRectForWindow(window),
       IsModalWindow(window));
 }
 
 #pragma mark -
 
 static Boolean ChromePluginIsWindowActive(WindowRef window) {
   const OpaquePluginRef delegate =
-      webkit::npapi::CarbonPluginWindowTracker::SharedInstance()->
-          GetDelegateForDummyWindow(window);
+      CarbonPluginWindowTracker::SharedInstance()->GetDelegateForDummyWindow(
+          window);
   return delegate ? IsContainingWindowActive(delegate)
                   : IsWindowActive(window);
 }
 
 static Boolean ChromePluginIsWindowHilited(WindowRef window) {
   const OpaquePluginRef delegate =
-      webkit::npapi::CarbonPluginWindowTracker::SharedInstance()->
-          GetDelegateForDummyWindow(window);
+      CarbonPluginWindowTracker::SharedInstance()->GetDelegateForDummyWindow(
+          window);
   return delegate ? IsContainingWindowActive(delegate)
                   : IsWindowHilited(window);
 }
 
 static void ChromePluginSelectWindow(WindowRef window) {
   mac_plugin_interposing::SwitchToPluginProcess();
   SelectWindow(window);
   OnPluginWindowSelected(window);
 }
 
@@ skipping 35 matching lines @@
 
 static void ChromePluginDisposeDialog(DialogRef dialog) {
   WindowRef window = GetDialogWindow(dialog);
   WindowInfo window_info(window);
   DisposeDialog(dialog);
   OnPluginWindowClosed(window_info);
 }
 
 static WindowPartCode ChromePluginFindWindow(Point point, WindowRef* window) {
   OpaquePluginRef delegate = mac_plugin_interposing::GetActiveDelegate();
-  webkit::npapi::CarbonPluginWindowTracker* tracker =
-      webkit::npapi::CarbonPluginWindowTracker::SharedInstance();
+  CarbonPluginWindowTracker* tracker =
+      CarbonPluginWindowTracker::SharedInstance();
   WindowRef plugin_window = tracker->GetDummyWindowForDelegate(delegate);
   if (plugin_window) {
     // If plugin_window is non-NULL, then we are in the middle of routing an
     // event to the plugin, so we know it's destined for this window already,
     // so we don't have to worry that we'll be stealing an event meant for an
     // overlapping window.
     Rect window_bounds;
     GetWindowBounds(plugin_window, kWindowContentRgn, &window_bounds);
     if (PtInRect(point, &window_bounds)) {
       if (window)
@@ skipping 43 matching lines @@
   INTERPOSE_FUNCTION(DisposeWindow),
   INTERPOSE_FUNCTION(HideWindow),
   INTERPOSE_FUNCTION(ReleaseWindow),
   INTERPOSE_FUNCTION(DisposeDialog),
   INTERPOSE_FUNCTION(FindWindow),
   INTERPOSE_FUNCTION(SetThemeCursor),
   INTERPOSE_FUNCTION(SetCursor),
 };
 
 #endif  // !__LP64__