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

chrome/plugin/plugin_interpose_util_mac.mm

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "chrome/plugin/plugin_interpose_util_mac.h"
 
 #import <AppKit/AppKit.h>
 #import <objc/runtime.h>
 
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/plugin_thread.h"
-#include "webkit/glue/plugins/webplugin_delegate_impl.h"
+#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 namespace mac_plugin_interposing {
 
 // TODO(stuartmorgan): Make this an IPC to order the plugin process above the
 // browser process only if the browser is current frontmost.
 __attribute__((visibility("default")))
 void SwitchToPluginProcess() {
   ProcessSerialNumber this_process, front_process;
   if ((GetCurrentProcess(&this_process) != noErr) ||
       (GetFrontProcess(&front_process) != noErr)) {
     return;
   }
 
   Boolean matched = false;
   if ((SameProcess(&this_process, &front_process, &matched) == noErr) &&
       !matched) {
     SetFrontProcess(&this_process);
   }
 }
 
 __attribute__((visibility("default")))
 OpaquePluginRef GetActiveDelegate() {
-  return WebPluginDelegateImpl::GetActiveDelegate();
+  return webkit::npapi::WebPluginDelegateImpl::GetActiveDelegate();
 }
 
 __attribute__((visibility("default")))
 void NotifyBrowserOfPluginSelectWindow(uint32 window_id, CGRect bounds,
                                        bool modal) {
   PluginThread* plugin_thread = PluginThread::current();
   if (plugin_thread) {
     gfx::Rect window_bounds(bounds);
     plugin_thread->Send(
         new PluginProcessHostMsg_PluginSelectWindow(window_id, window_bounds,
@@ skipping 19 matching lines @@
   if (plugin_thread) {
     gfx::Rect window_bounds(bounds);
     plugin_thread->Send(
         new PluginProcessHostMsg_PluginHideWindow(window_id, window_bounds));
   }
 }
 
 __attribute__((visibility("default")))
 void NotifyPluginOfSetThemeCursor(OpaquePluginRef delegate,
                                   ThemeCursor cursor) {
-  static_cast<WebPluginDelegateImpl*>(delegate)->SetThemeCursor(cursor);
+  static_cast<webkit::npapi::WebPluginDelegateImpl*>(delegate)->SetThemeCursor(
+      cursor);
 }
 
 __attribute__((visibility("default")))
 void NotifyPluginOfSetCursor(OpaquePluginRef delegate,
                              const Cursor* cursor) {
-  static_cast<WebPluginDelegateImpl*>(delegate)->SetCursor(cursor);
+  static_cast<webkit::npapi::WebPluginDelegateImpl*>(delegate)->SetCursor(
+      cursor);
 }
 
 void NotifyPluginOfSetCursorVisibility(bool visibility) {
   PluginThread* plugin_thread = PluginThread::current();
   if (plugin_thread) {
     plugin_thread->Send(
         new PluginProcessHostMsg_PluginSetCursorVisibility(visibility));
   }
 }
 
 __attribute__((visibility("default")))
 bool GetPluginWindowHasFocus(const OpaquePluginRef delegate) {
-  return static_cast<WebPluginDelegateImpl*>(delegate)->GetWindowHasFocus();
+  return static_cast<webkit::npapi::WebPluginDelegateImpl*>(
+      delegate)->GetWindowHasFocus();
 }
 
 }  // namespace mac_plugin_interposing
 
 #pragma mark -
 
 struct WindowInfo {
   uint32 window_id;
   CGRect bounds;
   WindowInfo(NSWindow* window) {
@@ skipping 125 matching lines @@
 - (void)chromePlugin_set;
 + (void)chromePlugin_hide;
 + (void)chromePlugin_unhide;
 @end
 
 @implementation NSCursor (ChromePluginInterposing)
 
 - (void)chromePlugin_set {
   OpaquePluginRef delegate = mac_plugin_interposing::GetActiveDelegate();
   if (delegate) {
-    static_cast<WebPluginDelegateImpl*>(delegate)->SetNSCursor(self);
+    static_cast<webkit::npapi::WebPluginDelegateImpl*>(delegate)->SetNSCursor(
+        self);
     return;
   }
   [self chromePlugin_set];
 }
 
 + (void)chromePlugin_hide {
   mac_plugin_interposing::NotifyPluginOfSetCursorVisibility(false);
 }
 
 + (void)chromePlugin_unhide {
@@ skipping 42 matching lines @@
   Class nscursor_class = [NSCursor class];
   ExchangeMethods(nscursor_class, NO, @selector(set),
                   @selector(chromePlugin_set));
   ExchangeMethods(nscursor_class, YES, @selector(hide),
                   @selector(chromePlugin_hide));
   ExchangeMethods(nscursor_class, YES, @selector(unhide),
                   @selector(chromePlugin_unhide));
 }
 
 }  // namespace mac_plugin_interposing