OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_so
urce.h" | 5 #include "chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_so
urce.h" |
6 | 6 |
7 #include "base/json/json_string_value_serializer.h" | 7 #include "base/json/json_string_value_serializer.h" |
8 #include "base/sys_info.h" | 8 #include "base/sys_info.h" |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 #if defined(OS_CHROMEOS) | 40 #if defined(OS_CHROMEOS) |
41 constexpr char kChromeEnrollmentTag[] = "ENTERPRISE_ENROLLED"; | 41 constexpr char kChromeEnrollmentTag[] = "ENTERPRISE_ENROLLED"; |
42 constexpr char kHWIDKey[] = "HWID"; | 42 constexpr char kHWIDKey[] = "HWID"; |
43 constexpr char kSettingsKey[] = "settings"; | 43 constexpr char kSettingsKey[] = "settings"; |
44 constexpr char kLocalStateSettingsResponseKey[] = "Local State: settings"; | 44 constexpr char kLocalStateSettingsResponseKey[] = "Local State: settings"; |
45 #else | 45 #else |
46 constexpr char kOsVersionTag[] = "OS VERSION"; | 46 constexpr char kOsVersionTag[] = "OS VERSION"; |
47 #endif | 47 #endif |
48 #if defined(OS_WIN) | 48 #if defined(OS_WIN) |
49 constexpr char kUsbKeyboardDetected[] = "usb_keyboard_detected"; | 49 constexpr char kUsbKeyboardDetected[] = "usb_keyboard_detected"; |
| 50 constexpr char kIsEnrolledToDomain[] = "enrolled_to_domain"; |
50 #endif | 51 #endif |
51 | 52 |
52 #if defined(OS_CHROMEOS) | 53 #if defined(OS_CHROMEOS) |
53 std::string GetEnrollmentStatusString() { | 54 std::string GetEnrollmentStatusString() { |
54 switch (ChromeOSMetricsProvider::GetEnrollmentStatus()) { | 55 switch (ChromeOSMetricsProvider::GetEnrollmentStatus()) { |
55 case ChromeOSMetricsProvider::NON_MANAGED: | 56 case ChromeOSMetricsProvider::NON_MANAGED: |
56 return "Not managed"; | 57 return "Not managed"; |
57 case ChromeOSMetricsProvider::MANAGED: | 58 case ChromeOSMetricsProvider::MANAGED: |
58 return "Managed"; | 59 return "Managed"; |
59 case ChromeOSMetricsProvider::UNUSED: | 60 case ChromeOSMetricsProvider::UNUSED: |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 std::string os_version = base::SysInfo::OperatingSystemName() + ": " + | 108 std::string os_version = base::SysInfo::OperatingSystemName() + ": " + |
108 base::SysInfo::OperatingSystemVersion(); | 109 base::SysInfo::OperatingSystemVersion(); |
109 (*response)[kOsVersionTag] = os_version; | 110 (*response)[kOsVersionTag] = os_version; |
110 #endif | 111 #endif |
111 | 112 |
112 PopulateSyncLogs(response.get()); | 113 PopulateSyncLogs(response.get()); |
113 PopulateExtensionInfoLogs(response.get()); | 114 PopulateExtensionInfoLogs(response.get()); |
114 PopulateDataReductionProxyLogs(response.get()); | 115 PopulateDataReductionProxyLogs(response.get()); |
115 #if defined(OS_WIN) | 116 #if defined(OS_WIN) |
116 PopulateUsbKeyboardDetected(response.get()); | 117 PopulateUsbKeyboardDetected(response.get()); |
| 118 PopulateEnrolledToDomain(response.get()); |
117 #endif | 119 #endif |
118 | 120 |
119 if (ProfileManager::GetLastUsedProfile()->IsChild()) | 121 if (ProfileManager::GetLastUsedProfile()->IsChild()) |
120 (*response)["account_type"] = "child"; | 122 (*response)["account_type"] = "child"; |
121 | 123 |
122 #if defined(OS_CHROMEOS) | 124 #if defined(OS_CHROMEOS) |
123 PopulateLocalStateSettings(response.get()); | 125 PopulateLocalStateSettings(response.get()); |
124 | 126 |
125 // Get the HWID on the blocking pool and invoke the callback later when done. | 127 // Get the HWID on the blocking pool and invoke the callback later when done. |
126 SystemLogsResponse* response_ptr = response.release(); | 128 SystemLogsResponse* response_ptr = response.release(); |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 | 232 |
231 #if defined(OS_WIN) | 233 #if defined(OS_WIN) |
232 void ChromeInternalLogSource::PopulateUsbKeyboardDetected( | 234 void ChromeInternalLogSource::PopulateUsbKeyboardDetected( |
233 SystemLogsResponse* response) { | 235 SystemLogsResponse* response) { |
234 std::string reason; | 236 std::string reason; |
235 bool result = base::win::IsKeyboardPresentOnSlate(&reason); | 237 bool result = base::win::IsKeyboardPresentOnSlate(&reason); |
236 (*response)[kUsbKeyboardDetected] = result ? "Keyboard Detected:\n" : | 238 (*response)[kUsbKeyboardDetected] = result ? "Keyboard Detected:\n" : |
237 "No Keyboard:\n"; | 239 "No Keyboard:\n"; |
238 (*response)[kUsbKeyboardDetected] += reason; | 240 (*response)[kUsbKeyboardDetected] += reason; |
239 } | 241 } |
| 242 |
| 243 void ChromeInternalLogSource::PopulateEnrolledToDomain( |
| 244 SystemLogsResponse* response) { |
| 245 (*response)[kIsEnrolledToDomain] = base::win::IsEnrolledToDomain() |
| 246 ? "Enrolled to domain" |
| 247 : "Not enrolled to domain"; |
| 248 } |
240 #endif | 249 #endif |
241 | 250 |
242 } // namespace system_logs | 251 } // namespace system_logs |
OLD | NEW |