Move plugin-related files in webkit/glue to webkit/glue/plugins to make them

easier to find. With a random subset of files in webkit/glue, it's impossible
to predict where you should find a file. No code change

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/1559008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43177 0039d316-1c4b-4281-b951-d872f2087c98

24 files changed, 41 insertions, 41 deletions

diff --git a/webkit/glue/plugins/gtk_plugin_container_manager.cc b/webkit/glue/plugins/gtk_plugin_container_manager.cc
index 53b6f4d..9d9ee4b 100644
--- a/webkit/glue/plugins/gtk_plugin_container_manager.cc
+++ b/webkit/glue/plugins/gtk_plugin_container_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "gfx/gtk_util.h"
 #include "webkit/glue/plugins/gtk_plugin_container.h"
-#include "webkit/glue/webplugin.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 GtkWidget* GtkPluginContainerManager::CreatePluginContainer(
     gfx::PluginWindowHandle id) {
diff --git a/webkit/glue/plugins/mac_accelerated_surface_container.cc b/webkit/glue/plugins/mac_accelerated_surface_container.cc
index 7d9ae67..8eca9d2 100644
--- a/webkit/glue/plugins/mac_accelerated_surface_container.cc
+++ b/webkit/glue/plugins/mac_accelerated_surface_container.cc
@@ -6,8 +6,8 @@
 
 #include "app/surface/io_surface_support_mac.h"
 #include "base/logging.h"
-#include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/mac_accelerated_surface_container_manager.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 MacAcceleratedSurfaceContainer::MacAcceleratedSurfaceContainer()
     : x_(0),
diff --git a/webkit/glue/plugins/mac_accelerated_surface_container_manager.cc b/webkit/glue/plugins/mac_accelerated_surface_container_manager.cc
index a149661..635348f 100644
--- a/webkit/glue/plugins/mac_accelerated_surface_container_manager.cc
+++ b/webkit/glue/plugins/mac_accelerated_surface_container_manager.cc
@@ -5,8 +5,8 @@
 #include "webkit/glue/plugins/mac_accelerated_surface_container_manager.h"
 
 #include "base/logging.h"
-#include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/mac_accelerated_surface_container.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 MacAcceleratedSurfaceContainerManager::MacAcceleratedSurfaceContainerManager()
     : current_id_(0) {
diff --git a/webkit/glue/plugins/npapi_extension_thunk.cc b/webkit/glue/plugins/npapi_extension_thunk.cc
index 0c25655..141d960 100644
--- a/webkit/glue/plugins/npapi_extension_thunk.cc
+++ b/webkit/glue/plugins/npapi_extension_thunk.cc
@@ -9,10 +9,10 @@
 #include "base/utf_string_conversions.h"
 #include "third_party/npapi/bindings/npapi_extensions.h"
 #include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/plugins/webplugin.h"
+#include "webkit/glue/plugins/webplugin_delegate.h"
 #include "webkit/glue/scoped_clipboard_writer_glue.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webplugin.h"
-#include "webkit/glue/webplugin_delegate.h"
 
 // FindInstance()
 // Finds a PluginInstance from an NPP.
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index b262188..bc2a6f2 100644
--- a/webkit/glue/plugins/plugin_host.cc
+++ b/webkit/glue/plugins/plugin_host.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -16,14 +16,14 @@
 #include "net/base/net_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
-#include "webkit/glue/webplugininfo.h"
-#include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/plugins/npapi_extension_thunk.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/plugin_stream_url.h"
+#include "webkit/glue/plugins/webplugin_delegate.h"
+#include "webkit/glue/plugins/webplugininfo.h"
 #include "third_party/npapi/bindings/npapi_extensions.h"
 #include "third_party/npapi/bindings/npruntime.h"
 
diff --git a/webkit/glue/plugins/plugin_instance.cc b/webkit/glue/plugins/plugin_instance.cc
index 037d043..db5ccbf 100644
--- a/webkit/glue/plugins/plugin_instance.cc
+++ b/webkit/glue/plugins/plugin_instance.cc
@@ -10,13 +10,13 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "webkit/glue/webplugin.h"
-#include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/plugins/plugin_host.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/plugins/plugin_stream_url.h"
 #include "webkit/glue/plugins/plugin_string_stream.h"
+#include "webkit/glue/plugins/webplugin.h"
+#include "webkit/glue/plugins/webplugin_delegate.h"
 #include "net/base/escape.h"
 
 #if defined(OS_MACOSX)
diff --git a/webkit/glue/plugins/plugin_lib.h b/webkit/glue/plugins/plugin_lib.h
index 6af2893..dc0b304 100644
--- a/webkit/glue/plugins/plugin_lib.h
+++ b/webkit/glue/plugins/plugin_lib.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -14,7 +14,7 @@
 #include "base/ref_counted.h"
 #include "build/build_config.h"
 #include "webkit/glue/plugins/plugin_list.h"
-#include "webkit/glue/webplugin.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 struct WebPluginInfo;
 
diff --git a/webkit/glue/plugins/plugin_list.h b/webkit/glue/plugins/plugin_list.h
index b80d83b..d4aa31c 100644
--- a/webkit/glue/plugins/plugin_list.h
+++ b/webkit/glue/plugins/plugin_list.h
@@ -14,7 +14,7 @@
 #include "base/file_path.h"
 #include "base/lock.h"
 #include "third_party/npapi/bindings/nphostapi.h"
-#include "webkit/glue/webplugininfo.h"
+#include "webkit/glue/plugins/webplugininfo.h"
 
 class GURL;
 
diff --git a/webkit/glue/plugins/plugin_stream_url.cc b/webkit/glue/plugins/plugin_stream_url.cc
index 38f7edd..6694139 100644
--- a/webkit/glue/plugins/plugin_stream_url.cc
+++ b/webkit/glue/plugins/plugin_stream_url.cc
@@ -1,12 +1,12 @@
-// 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 "webkit/glue/plugins/plugin_stream_url.h"
 
-#include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/plugin_host.h"
 #include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 namespace NPAPI {
 
diff --git a/webkit/glue/plugins/plugin_stream_url.h b/webkit/glue/plugins/plugin_stream_url.h
index 7d3f59a..688723c 100644
--- a/webkit/glue/plugins/plugin_stream_url.h
+++ b/webkit/glue/plugins/plugin_stream_url.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,8 +6,8 @@
 #define WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__
 
 
-#include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/plugin_stream.h"
+#include "webkit/glue/plugins/webplugin.h"
 #include "googleurl/src/gurl.h"
 
 namespace NPAPI {
diff --git a/webkit/glue/webplugin.cc b/webkit/glue/plugins/webplugin.cc
index 237e60c..6443318 100644
--- a/webkit/glue/webplugin.cc
+++ b/webkit/glue/plugins/webplugin.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/webplugin.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 namespace webkit_glue {
 
diff --git a/webkit/glue/webplugin.h b/webkit/glue/plugins/webplugin.h
index cde5fce..cde5fce 100644
--- a/webkit/glue/webplugin.h
+++ b/webkit/glue/plugins/webplugin.h
diff --git a/webkit/glue/webplugin_delegate.h b/webkit/glue/plugins/webplugin_delegate.h
index 0b08c9e..0b08c9e 100644
--- a/webkit/glue/webplugin_delegate.h
+++ b/webkit/glue/plugins/webplugin_delegate.h
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.h b/webkit/glue/plugins/webplugin_delegate_impl.h
index a66f282..3295a08 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl.h
+++ b/webkit/glue/plugins/webplugin_delegate_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -19,8 +19,8 @@
 #include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
 #include "third_party/npapi/bindings/npapi.h"
+#include "webkit/glue/plugins/webplugin_delegate.h"
 #include "webkit/glue/webcursor.h"
-#include "webkit/glue/webplugin_delegate.h"
 
 #if defined(OS_MACOSX)
 #include "app/surface/accelerated_surface_mac.h"
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
index 2c6b239..2501b01 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
@@ -20,13 +20,13 @@
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/gtk_plugin_container.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/plugin_stream_url.h"
+#include "webkit/glue/plugins/webplugin.h"
 #include "webkit/glue/webkit_glue.h"
 
 #include "third_party/npapi/bindings/npapi_x11.h"
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
index 1d0b138..bf74453 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
+++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
@@ -1,4 +1,4 @@
-// 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.
 
@@ -19,13 +19,13 @@
 #include "base/string_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "webkit/default_plugin/plugin_impl.h"
-#include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/coregraphics_private_symbols_mac.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/plugin_stream_url.h"
 #include "webkit/glue/plugins/plugin_web_event_converter_mac.h"
+#include "webkit/glue/plugins/webplugin.h"
 #include "webkit/glue/webkit_glue.h"
 
 #ifndef NP_NO_CARBON
@@ -1125,7 +1125,7 @@ bool WebPluginDelegateImpl::PlatformHandleInputEvent(
   if (!(event_converter.get() && event_converter->InitWithEvent(event)))
     return false;
   void* plugin_event = event_converter->plugin_event();
-  
+
   if (fabsf(zoom_level - 1.0) > kEpsilon)
     event_converter->SetZoomLevel(zoom_level);
 
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
index 2c31856..1c83565 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
@@ -24,8 +24,8 @@
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/plugin_stream_url.h"
+#include "webkit/glue/plugins/webplugin.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webplugin.h"
 
 using WebKit::WebCursorInfo;
 using WebKit::WebKeyboardEvent;
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/plugins/webplugin_impl.cc
index f42d36e..e701675 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/plugins/webplugin_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 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.
 
@@ -32,11 +32,11 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/multipart_response_delegate.h"
-#include "webkit/glue/webplugin_impl.h"
 #include "webkit/glue/plugins/plugin_host.h"
 #include "webkit/glue/plugins/plugin_instance.h"
-#include "webkit/glue/webplugin_delegate.h"
-#include "webkit/glue/webplugin_page_delegate.h"
+#include "webkit/glue/plugins/webplugin_delegate.h"
+#include "webkit/glue/plugins/webplugin_impl.h"
+#include "webkit/glue/plugins/webplugin_page_delegate.h"
 #include "googleurl/src/gurl.h"
 
 using WebKit::WebCanvas;
diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/plugins/webplugin_impl.h
index d2eb64b..fd6ea25 100644
--- a/webkit/glue/webplugin_impl.h
+++ b/webkit/glue/plugins/webplugin_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 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.
 
@@ -21,7 +21,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
-#include "webkit/glue/webplugin.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 class WebViewDelegate;
 
diff --git a/webkit/glue/webplugin_impl_unittest.cc b/webkit/glue/plugins/webplugin_impl_unittest.cc
index 4d15e54..e70e39a 100644
--- a/webkit/glue/webplugin_impl_unittest.cc
+++ b/webkit/glue/plugins/webplugin_impl_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 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.
 
@@ -7,7 +7,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
-#include "webkit/glue/webplugin_impl.h"
+#include "webkit/glue/plugins/webplugin_impl.h"
 
 using WebKit::WebHTTPBody;
 using WebKit::WebString;
diff --git a/webkit/glue/webplugin_page_delegate.h b/webkit/glue/plugins/webplugin_page_delegate.h
index 8bc5723..8bc5723 100644
--- a/webkit/glue/webplugin_page_delegate.h
+++ b/webkit/glue/plugins/webplugin_page_delegate.h
diff --git a/webkit/glue/webplugininfo.h b/webkit/glue/plugins/webplugininfo.h
index 21f34df..21f34df 100644
--- a/webkit/glue/webplugininfo.h
+++ b/webkit/glue/plugins/webplugininfo.h
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index ff96daa..55066f7 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -184,13 +184,19 @@
         'plugins/plugin_stubs.cc',
         'plugins/plugin_web_event_converter_mac.h',
         'plugins/plugin_web_event_converter_mac.mm',
+        'plugins/webplugin.cc',
+        'plugins/webplugin.h',
         'plugins/webplugin_2d_device_delegate.h',
         'plugins/webplugin_3d_device_delegate.h',
+        'plugins/webplugin_delegate.h',
         'plugins/webplugin_delegate_impl.cc',
         'plugins/webplugin_delegate_impl.h',
         'plugins/webplugin_delegate_impl_gtk.cc',
         'plugins/webplugin_delegate_impl_mac.mm',
         'plugins/webplugin_delegate_impl_win.cc',
+        'plugins/webplugin_impl.cc',
+        'plugins/webplugin_impl.h',
+        'plugins/webplugininfo.h',
         'alt_error_page_resource_fetcher.cc',
         'alt_error_page_resource_fetcher.h',
         'context_menu.h',
@@ -255,12 +261,6 @@
         'webmenurunner_mac.mm',
         'webpasswordautocompletelistener_impl.cc',
         'webpasswordautocompletelistener_impl.h',
-        'webplugin.cc',
-        'webplugin.h',
-        'webplugin_delegate.h',
-        'webplugin_impl.cc',
-        'webplugin_impl.h',
-        'webplugininfo.h',
         'webpreferences.cc',
         'webpreferences.h',
         'websocketstreamhandle_bridge.h',
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index a8fcac3..34c24c6 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -35,8 +35,8 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/plugins/webplugininfo.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webplugininfo.h"
 #include "webkit/glue/websocketstreamhandle_impl.h"
 #include "webkit/glue/weburlloader_impl.h"