Eliminate remaining WebCore dependencies from webplugin_impl.cc...

webkit/glue/webplugin.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-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.
 
-#ifndef WEBKIT_GLUE_WEBPLUGIN_H__
-#define WEBKIT_GLUE_WEBPLUGIN_H__
+#ifndef WEBKIT_GLUE_WEBPLUGIN_H_
+#define WEBKIT_GLUE_WEBPLUGIN_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/native_widget_types.h"
 
 // TODO(port): this typedef is obviously incorrect on non-Windows
 // platforms, but now a lot of code now accidentally depends on them
 // existing.  #ifdef out these declarations and fix all the users.
 typedef void* HANDLE;
 
 class GURL;
+struct NPObject;
+
+namespace WebKit {
+class WebFrame;
+}
+
+namespace webkit_glue {
+
+class WebPluginParentView;
 class WebPluginResourceClient;
 
-struct NPObject;
-
 // Describes the new location for a plugin window.
 struct WebPluginGeometry {
   // On Windows, this is the plugin window in the plugin process.
   // On X11, this is the XID of the plugin-side GtkPlug containing the
   // GtkSocket hosting the actual plugin window.
   gfx::PluginWindowHandle window;
   gfx::Rect window_rect;
   // Clip rect (include) and cutouts (excludes), relative to
   // window_rect origin.
   gfx::Rect clip_rect;
   std::vector<gfx::Rect> cutout_rects;
   bool rects_valid;
   bool visible;
 };
 
-
-enum RoutingStatus {
-  ROUTED,
-  NOT_ROUTED,
-  INVALID_URL,
-  GENERAL_FAILURE
-};
-
 // The WebKit side of a plugin implementation.  It provides wrappers around
 // operations that need to interact with the frame and other WebCore objects.
 class WebPlugin {
  public:
-  WebPlugin() { }
-  virtual ~WebPlugin() { }
+  virtual ~WebPlugin() {}
 
   // Called by the plugin delegate to let the WebPlugin know if the plugin is
   // windowed (i.e. handle is not NULL) or windowless (handle is NULL).  This
   // tells the WebPlugin to send mouse/keyboard events to the plugin delegate,
   // as well as the information about the HDC for paint operations.
   virtual void SetWindow(gfx::PluginWindowHandle window) = 0;
 
   // Called by the plugin delegate to let it know that the window is being
   // destroyed.
   virtual void WillDestroyWindow(gfx::PluginWindowHandle window) = 0;
@@ skipping 56 matching lines @@
   // Returns true iff in off the record (Incognito) mode.
   virtual bool IsOffTheRecord() = 0;
 
   // Called when the WebPluginResourceClient instance is deleted.
   virtual void ResourceClientDeleted(
       WebPluginResourceClient* resource_client) {}
 
   // Defers the loading of the resource identified by resource_id. This is
   // controlled by the defer parameter.
   virtual void SetDeferResourceLoading(int resource_id, bool defer) = 0;
-
- private:
-  DISALLOW_EVIL_CONSTRUCTORS(WebPlugin);
 };
 
 // Simpler version of ResourceHandleClient that lends itself to proxying.
 class WebPluginResourceClient {
  public:
   virtual ~WebPluginResourceClient() {}
   virtual void WillSendRequest(const GURL& url) = 0;
   // The request_is_seekable parameter indicates whether byte range requests
   // can be issued for the underlying stream.
   virtual void DidReceiveResponse(const std::string& mime_type,
                                   const std::string& headers,
                                   uint32 expected_length,
                                   uint32 last_modified,
                                   bool request_is_seekable) = 0;
   virtual void DidReceiveData(const char* buffer, int length,
                               int data_offset) = 0;
   virtual void DidFinishLoading() = 0;
   virtual void DidFail() = 0;
   virtual bool IsMultiByteResponseExpected() = 0;
 };
 
+}  // namespace webkit_glue
 
-#endif  // #ifndef WEBKIT_GLUE_WEBPLUGIN_H__
+#endif  // #ifndef WEBKIT_GLUE_WEBPLUGIN_H_