diff options
Diffstat (limited to 'remoting/host/win')
| -rw-r--r-- | remoting/host/win/elevated_controller.cc | 4 | ||||
| -rw-r--r-- | remoting/host/win/host_service.cc | 2 | ||||
| -rw-r--r-- | remoting/host/win/launch_process_with_token.cc | 2 | ||||
| -rw-r--r-- | remoting/host/win/message_window.cc | 2 | ||||
| -rw-r--r-- | remoting/host/win/rdp_client_window.cc | 2 | ||||
| -rw-r--r-- | remoting/host/win/security_descriptor.cc | 2 | ||||
| -rw-r--r-- | remoting/host/win/unprivileged_process_delegate.cc | 2 | ||||
| -rw-r--r-- | remoting/host/win/wts_session_process_delegate.cc | 2 | ||||
| -rw-r--r-- | remoting/host/win/wts_terminal_monitor.cc | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/remoting/host/win/elevated_controller.cc b/remoting/host/win/elevated_controller.cc index 6dbf459..3911c2e 100644 --- a/remoting/host/win/elevated_controller.cc +++ b/remoting/host/win/elevated_controller.cc @@ -6,13 +6,13 @@ #include "base/file_util.h" #include "base/file_version_info.h" -#include "base/logging.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "base/win/scoped_handle.h" #include "remoting/host/branding.h" diff --git a/remoting/host/win/host_service.cc b/remoting/host/win/host_service.cc index b3cf6b0..a76eb05 100644 --- a/remoting/host/win/host_service.cc +++ b/remoting/host/win/host_service.cc @@ -19,8 +19,8 @@ #include "base/message_loop.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" #include "remoting/base/auto_thread.h" diff --git a/remoting/host/win/launch_process_with_token.cc b/remoting/host/win/launch_process_with_token.cc index 8f0173c..e23523d 100644 --- a/remoting/host/win/launch_process_with_token.cc +++ b/remoting/host/win/launch_process_with_token.cc @@ -16,7 +16,7 @@ #include "base/scoped_native_library.h" #include "base/string16.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" #include "base/win/windows_version.h" diff --git a/remoting/host/win/message_window.cc b/remoting/host/win/message_window.cc index b36b3f6..b4f9494 100644 --- a/remoting/host/win/message_window.cc +++ b/remoting/host/win/message_window.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/wrapped_window_proc.h" const char kClassNameFormat[] = "Chromoting_MessageWindow_%p"; diff --git a/remoting/host/win/rdp_client_window.cc b/remoting/host/win/rdp_client_window.cc index 787f8d2..543a20a 100644 --- a/remoting/host/win/rdp_client_window.cc +++ b/remoting/host/win/rdp_client_window.cc @@ -11,8 +11,8 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/string16.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_local.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_bstr.h" namespace remoting { diff --git a/remoting/host/win/security_descriptor.cc b/remoting/host/win/security_descriptor.cc index 1f53505..f7e535d 100644 --- a/remoting/host/win/security_descriptor.cc +++ b/remoting/host/win/security_descriptor.cc @@ -7,7 +7,7 @@ #include <sddl.h> #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace remoting { diff --git a/remoting/host/win/unprivileged_process_delegate.cc b/remoting/host/win/unprivileged_process_delegate.cc index a52876e..e968c38 100644 --- a/remoting/host/win/unprivileged_process_delegate.cc +++ b/remoting/host/win/unprivileged_process_delegate.cc @@ -17,8 +17,8 @@ #include "base/single_thread_task_runner.h" #include "base/string16.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" #include "ipc/ipc_channel.h" diff --git a/remoting/host/win/wts_session_process_delegate.cc b/remoting/host/win/wts_session_process_delegate.cc index 26e4eea..57920d5 100644 --- a/remoting/host/win/wts_session_process_delegate.cc +++ b/remoting/host/win/wts_session_process_delegate.cc @@ -13,8 +13,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/single_thread_task_runner.h" +#include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" #include "ipc/ipc_channel.h" diff --git a/remoting/host/win/wts_terminal_monitor.cc b/remoting/host/win/wts_terminal_monitor.cc index 414a86b..33896de 100644 --- a/remoting/host/win/wts_terminal_monitor.cc +++ b/remoting/host/win/wts_terminal_monitor.cc @@ -13,7 +13,7 @@ #include "base/lazy_instance.h" #include "base/native_library.h" #include "base/scoped_native_library.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/ip_endpoint.h" namespace { |