summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-25 01:28:35 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-25 01:28:35 +0000
commit23e4309d1bb2912977e3911756580eaaa4005f4d (patch)
tree4db4e601fb09ee31376bcb916bacb2d0dfd6b545
parent62e50b76da96ebabdb444a605945b471347f6fa5 (diff)
downloadchromium_src-23e4309d1bb2912977e3911756580eaaa4005f4d.zip
chromium_src-23e4309d1bb2912977e3911756580eaaa4005f4d.tar.gz
chromium_src-23e4309d1bb2912977e3911756580eaaa4005f4d.tar.bz2
Renaming remoting_host_service*.* -> host_service*.* to make class names and file names consistent.
Review URL: http://codereview.chromium.org/9467018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123619 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--remoting/host/host_service.rc (renamed from remoting/host/remoting_host_service.rc)4
-rw-r--r--remoting/host/host_service_resource.h (renamed from remoting/host/remoting_host_service_resource.h)2
-rw-r--r--remoting/host/host_service_win.cc (renamed from remoting/host/remoting_host_service_win.cc)4
-rw-r--r--remoting/host/host_service_win.h (renamed from remoting/host/remoting_host_service_win.h)6
-rw-r--r--remoting/remoting.gyp8
5 files changed, 12 insertions, 12 deletions
diff --git a/remoting/host/remoting_host_service.rc b/remoting/host/host_service.rc
index a24db8c..983c069 100644
--- a/remoting/host/remoting_host_service.rc
+++ b/remoting/host/host_service.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "remoting_host_service_resource.h"
+#include "host_service_resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 TEXTINCLUDE
BEGIN
- "remoting_host_service_resource.\0"
+ "host_service_resource.\0"
END
2 TEXTINCLUDE
diff --git a/remoting/host/remoting_host_service_resource.h b/remoting/host/host_service_resource.h
index 36be281..82de04d 100644
--- a/remoting/host/remoting_host_service_resource.h
+++ b/remoting/host/host_service_resource.h
@@ -4,7 +4,7 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by remoting_host_service.rc
+// Used by host_service.rc
//
#define IDS_DISPLAY_SERVICE_NAME 101
#define IDS_SERVICE_DESCRIPTION 102
diff --git a/remoting/host/remoting_host_service_win.cc b/remoting/host/host_service_win.cc
index e0ac078..ef42a7d 100644
--- a/remoting/host/remoting_host_service_win.cc
+++ b/remoting/host/host_service_win.cc
@@ -5,7 +5,7 @@
// This file implements the Windows service controlling Me2Me host processes
// running within user sessions.
-#include "remoting/host/remoting_host_service_win.h"
+#include "remoting/host/host_service_win.h"
#include <windows.h>
#include <wtsapi32.h>
@@ -23,7 +23,7 @@
#include "base/utf_string_conversions.h"
#include "base/win/wrapped_window_proc.h"
-#include "remoting/host/remoting_host_service_resource.h"
+#include "remoting/host/host_service_resource.h"
#include "remoting/base/scoped_sc_handle_win.h"
#include "remoting/host/wts_console_observer_win.h"
#include "remoting/host/wts_session_process_launcher_win.h"
diff --git a/remoting/host/remoting_host_service_win.h b/remoting/host/host_service_win.h
index 0317f93..48dd1a9 100644
--- a/remoting/host/remoting_host_service_win.h
+++ b/remoting/host/host_service_win.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_REMOTING_HOST_SERVICE_WIN_H_
-#define REMOTING_HOST_REMOTING_HOST_SERVICE_WIN_H_
+#ifndef REMOTING_HOST_HOST_SERVICE_WIN_H_
+#define REMOTING_HOST_HOST_SERVICE_WIN_H_
#include <windows.h>
@@ -114,4 +114,4 @@ class HostService : public WtsConsoleMonitor {
} // namespace remoting
-#endif // REMOTING_HOST_REMOTING_HOST_SERVICE_WIN_H_
+#endif // REMOTING_HOST_HOST_SERVICE_WIN_H_
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 2c5e546..6ea833e 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -232,10 +232,10 @@
'sources': [
'base/scoped_sc_handle_win.cc',
'base/scoped_sc_handle_win.h',
- 'host/remoting_host_service.rc',
- 'host/remoting_host_service_resource.h',
- 'host/remoting_host_service_win.cc',
- 'host/remoting_host_service_win.h',
+ 'host/host_service.rc',
+ 'host/host_service_resource.h',
+ 'host/host_service_win.cc',
+ 'host/host_service_win.h',
'host/wts_console_monitor_win.h',
'host/wts_console_observer_win.h',
'host/wts_session_process_launcher_win.cc',