| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/host/host_details.h" | 5 #include "remoting/host/host_details.h" |
| 6 | 6 |
| 7 #include "base/sys_info.h" | 7 #include "base/sys_info.h" |
| 8 #include "build/build_config.h" |
| 8 | 9 |
| 9 #if defined(OS_LINUX) | 10 #if defined(OS_LINUX) |
| 10 #include "base/linux_util.h" | 11 #include "base/linux_util.h" |
| 11 #endif | 12 #endif |
| 12 | 13 |
| 13 namespace remoting { | 14 namespace remoting { |
| 14 | 15 |
| 15 // Get the host Operating System Name, removing the need to check for OS | 16 // Get the host Operating System Name, removing the need to check for OS |
| 16 // definitions and keeps the keys used consistant. | 17 // definitions and keeps the keys used consistant. |
| 17 std::string GetHostOperatingSystemName() { | 18 std::string GetHostOperatingSystemName() { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 30 // definitions and keeps the format used consistant. | 31 // definitions and keeps the format used consistant. |
| 31 std::string GetHostOperatingSystemVersion() { | 32 std::string GetHostOperatingSystemVersion() { |
| 32 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | 33 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) |
| 33 return base::SysInfo::OperatingSystemVersion(); | 34 return base::SysInfo::OperatingSystemVersion(); |
| 34 #elif defined(OS_LINUX) | 35 #elif defined(OS_LINUX) |
| 35 return base::GetLinuxDistro(); | 36 return base::GetLinuxDistro(); |
| 36 #endif | 37 #endif |
| 37 } | 38 } |
| 38 | 39 |
| 39 } // namespace remoting | 40 } // namespace remoting |
| OLD | NEW |