Move the Remoting Host plugin into its own sub-directory.

BUG=
TEST=

Review URL: http://codereview.chromium.org/7216018

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

11 files changed, 34 insertions, 32 deletions

diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc
index 09f6b16..c94bc2a 100644
--- a/remoting/host/disconnect_window_win.cc
+++ b/remoting/host/disconnect_window_win.cc
@@ -10,7 +10,9 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "remoting/host/chromoting_host.h"
-#include "remoting/host/host_plugin_resource.h"
+// TODO(wez): The DisconnectWindow isn't plugin-specific, so shouldn't have
+// a dependency on the plugin's resource header.
+#include "remoting/host/plugin/host_plugin_resource.h"
 
 // HMODULE from DllMain/WinMain. This is needed to find our dialog resource.
 // This is defined in:
diff --git a/remoting/host/host_plugin-Info.plist b/remoting/host/plugin/host_plugin-Info.plist
index ca6b0eb..ca6b0eb 100644
--- a/remoting/host/host_plugin-Info.plist
+++ b/remoting/host/plugin/host_plugin-Info.plist
diff --git a/remoting/host/host_plugin.cc b/remoting/host/plugin/host_plugin.cc
index 5c0e387..f901a03 100644
--- a/remoting/host/host_plugin.cc
+++ b/remoting/host/plugin/host_plugin.cc
@@ -12,8 +12,8 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/stringize_macros.h"
-#include "remoting/host/host_plugin_utils.h"
-#include "remoting/host/host_script_object.h"
+#include "remoting/host/plugin/host_plugin_utils.h"
+#include "remoting/host/plugin/host_script_object.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npfunctions.h"
 #include "third_party/npapi/bindings/npruntime.h"
diff --git a/remoting/host/host_plugin.def b/remoting/host/plugin/host_plugin.def
index 2275abf..2275abf 100644
--- a/remoting/host/host_plugin.def
+++ b/remoting/host/plugin/host_plugin.def
diff --git a/remoting/host/host_plugin.rc b/remoting/host/plugin/host_plugin.rc
index 7abaf48..7abaf48 100644
--- a/remoting/host/host_plugin.rc
+++ b/remoting/host/plugin/host_plugin.rc
diff --git a/remoting/host/host_plugin_resource.h b/remoting/host/plugin/host_plugin_resource.h
index 71937ec..71937ec 100644
--- a/remoting/host/host_plugin_resource.h
+++ b/remoting/host/plugin/host_plugin_resource.h
diff --git a/remoting/host/host_plugin_utils.cc b/remoting/host/plugin/host_plugin_utils.cc
index 8a52e3f..f8e36bd 100644
--- a/remoting/host/host_plugin_utils.cc
+++ b/remoting/host/plugin/host_plugin_utils.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 "remoting/host/host_plugin_utils.h"
+#include "remoting/host/plugin/host_plugin_utils.h"
 
 namespace remoting {
 
diff --git a/remoting/host/host_plugin_utils.h b/remoting/host/plugin/host_plugin_utils.h
index 69ac302..363da4f 100644
--- a/remoting/host/host_plugin_utils.h
+++ b/remoting/host/plugin/host_plugin_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_HOST_HOST_PLUGIN_UTILS_H_
-#define REMOTING_HOST_HOST_PLUGIN_UTILS_H_
+#ifndef REMOTING_HOST_PLUGIN_HOST_PLUGIN_UTILS_H_
+#define REMOTING_HOST_PLUGIN_HOST_PLUGIN_UTILS_H_
 
 #include <string>
 
@@ -32,4 +32,4 @@ NPObject* ObjectFromNPVariant(const NPVariant& variant);
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_HOST_PLUGIN_UTILS_H_
+#endif  // REMOTING_HOST_PLUGIN_HOST_PLUGIN_UTILS_H_
diff --git a/remoting/host/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index 02c2daf..9686492 100644
--- a/remoting/host/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.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 "remoting/host/host_script_object.h"
+#include "remoting/host/plugin/host_script_object.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ -13,8 +13,8 @@
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/host_config.h"
 #include "remoting/host/host_key_pair.h"
-#include "remoting/host/host_plugin_utils.h"
 #include "remoting/host/in_memory_host_config.h"
+#include "remoting/host/plugin/host_plugin_utils.h"
 #include "remoting/host/register_support_host_request.h"
 #include "remoting/host/support_access_verifier.h"
 
diff --git a/remoting/host/host_script_object.h b/remoting/host/plugin/host_script_object.h
index b12ed7b..47e4fb4 100644
--- a/remoting/host/host_script_object.h
+++ b/remoting/host/plugin/host_script_object.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_HOST_HOST_SCRIPT_OBJECT_H_
-#define REMOTING_HOST_HOST_SCRIPT_OBJECT_H_
+#ifndef REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
+#define REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
 
 #include <string>
 #include <vector>
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index e8f64c4..b2c7fc7 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -167,29 +167,21 @@
         '../third_party/npapi/npapi.gyp:npapi',
       ],
       'sources': [
-        'host/continue_window.h',
-        'host/continue_window_mac.mm',
-        'host/continue_window_linux.cc',
-        'host/continue_window_win.cc',
-        'host/disconnect_window_linux.cc',
-        'host/disconnect_window_mac.h',
-        'host/disconnect_window_mac.mm',
-        'host/disconnect_window_win.cc',
-        'host/host_plugin.cc',
-        'host/host_plugin.def',
-        'host/host_plugin.rc',
-        'host/host_plugin_resource.h',
-        'host/host_plugin_utils.cc',
-        'host/host_plugin_utils.h',
-        'host/host_script_object.cc',
-        'host/host_script_object.h',
+        'host/plugin/host_plugin.cc',
+        'host/plugin/host_plugin.def',
+        'host/plugin/host_plugin.rc',
+        'host/plugin/host_plugin_resource.h',
+        'host/plugin/host_plugin_utils.cc',
+        'host/plugin/host_plugin_utils.h',
+        'host/plugin/host_script_object.cc',
+        'host/plugin/host_script_object.h',
       ],
       'conditions': [
         ['OS=="mac"', {
           'mac_bundle': 1,
           'xcode_settings': {
             'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
-            'INFOPLIST_FILE': 'host/host_plugin-Info.plist',
+            'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist',
             'INFOPLIST_PREPROCESS': 'YES',
             'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE=<(host_plugin_mime_type)',
             'WRAPPER_EXTENSION': '<(plugin_extension)',
@@ -209,10 +201,10 @@
           # three times it is listed here.
           'mac_bundle_resources': [
             'host/disconnect_window.xib',
-            'host/host_plugin-Info.plist',
+            'host/plugin/host_plugin-Info.plist',
           ],
           'mac_bundle_resources!': [
-            'host/host_plugin-Info.plist',
+            'host/plugin/host_plugin-Info.plist',
           ],
         }],
         ['OS=="win"', { # TODO(wez): Remove if libvpx is built by MSVC.
@@ -226,8 +218,8 @@
         }],
         ['OS!="win"', {
           'sources!': [
-            'host/host_plugin.def',
-            'host/host_plugin.rc',
+            'host/plugin/host_plugin.def',
+            'host/plugin/host_plugin.rc',
           ],
         }],
       ],
@@ -376,6 +368,10 @@
         'host/chromoting_host_context.h',
         'host/client_session.cc',
         'host/client_session.h',
+        'host/continue_window.h',
+        'host/continue_window_mac.mm',
+        'host/continue_window_linux.cc',
+        'host/continue_window_win.cc',
         'host/curtain.h',
         'host/curtain_linux.cc',
         'host/curtain_mac.cc',
@@ -384,6 +380,10 @@
         'host/desktop_environment.h',
         'host/differ.h',
         'host/differ.cc',
+        'host/disconnect_window_linux.cc',
+        'host/disconnect_window_mac.h',
+        'host/disconnect_window_mac.mm',
+        'host/disconnect_window_win.cc',
         'host/event_executor.h',
         'host/event_executor_linux.cc',
         'host/event_executor_mac.cc',