Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(563)

Side by Side Diff: chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc

Issue 2563473002: Add Windows installer brand code to feedback logs. (Closed)
Patch Set: Add Windows installer brand code to feedback logs. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "chrome/browser/google/google_brand.h"
11 #include "chrome/browser/profiles/profile_manager.h" 12 #include "chrome/browser/profiles/profile_manager.h"
12 #include "chrome/browser/sync/profile_sync_service_factory.h" 13 #include "chrome/browser/sync/profile_sync_service_factory.h"
13 #include "chrome/common/channel_info.h" 14 #include "chrome/common/channel_info.h"
14 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
15 #include "components/browser_sync/profile_sync_service.h" 16 #include "components/browser_sync/profile_sync_service.h"
16 #include "components/prefs/pref_service.h" 17 #include "components/prefs/pref_service.h"
17 #include "components/sync/driver/about_sync_util.h" 18 #include "components/sync/driver/about_sync_util.h"
18 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
19 #include "extensions/browser/extension_registry.h" 20 #include "extensions/browser/extension_registry.h"
20 #include "extensions/common/extension.h" 21 #include "extensions/common/extension.h"
(...skipping 20 matching lines...) Expand all
41 constexpr char kChromeEnrollmentTag[] = "ENTERPRISE_ENROLLED"; 42 constexpr char kChromeEnrollmentTag[] = "ENTERPRISE_ENROLLED";
42 constexpr char kHWIDKey[] = "HWID"; 43 constexpr char kHWIDKey[] = "HWID";
43 constexpr char kSettingsKey[] = "settings"; 44 constexpr char kSettingsKey[] = "settings";
44 constexpr char kLocalStateSettingsResponseKey[] = "Local State: settings"; 45 constexpr char kLocalStateSettingsResponseKey[] = "Local State: settings";
45 #else 46 #else
46 constexpr char kOsVersionTag[] = "OS VERSION"; 47 constexpr char kOsVersionTag[] = "OS VERSION";
47 #endif 48 #endif
48 #if defined(OS_WIN) 49 #if defined(OS_WIN)
49 constexpr char kUsbKeyboardDetected[] = "usb_keyboard_detected"; 50 constexpr char kUsbKeyboardDetected[] = "usb_keyboard_detected";
50 constexpr char kIsEnrolledToDomain[] = "enrolled_to_domain"; 51 constexpr char kIsEnrolledToDomain[] = "enrolled_to_domain";
52 constexpr char kInstallerBrandCode[] = "installer_brand_code";
51 #endif 53 #endif
52 54
53 #if defined(OS_CHROMEOS) 55 #if defined(OS_CHROMEOS)
54 std::string GetEnrollmentStatusString() { 56 std::string GetEnrollmentStatusString() {
55 switch (ChromeOSMetricsProvider::GetEnrollmentStatus()) { 57 switch (ChromeOSMetricsProvider::GetEnrollmentStatus()) {
56 case ChromeOSMetricsProvider::NON_MANAGED: 58 case ChromeOSMetricsProvider::NON_MANAGED:
57 return "Not managed"; 59 return "Not managed";
58 case ChromeOSMetricsProvider::MANAGED: 60 case ChromeOSMetricsProvider::MANAGED:
59 return "Managed"; 61 return "Managed";
60 case ChromeOSMetricsProvider::UNUSED: 62 case ChromeOSMetricsProvider::UNUSED:
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 base::SysInfo::OperatingSystemVersion(); 111 base::SysInfo::OperatingSystemVersion();
110 (*response)[kOsVersionTag] = os_version; 112 (*response)[kOsVersionTag] = os_version;
111 #endif 113 #endif
112 114
113 PopulateSyncLogs(response.get()); 115 PopulateSyncLogs(response.get());
114 PopulateExtensionInfoLogs(response.get()); 116 PopulateExtensionInfoLogs(response.get());
115 PopulateDataReductionProxyLogs(response.get()); 117 PopulateDataReductionProxyLogs(response.get());
116 #if defined(OS_WIN) 118 #if defined(OS_WIN)
117 PopulateUsbKeyboardDetected(response.get()); 119 PopulateUsbKeyboardDetected(response.get());
118 PopulateEnrolledToDomain(response.get()); 120 PopulateEnrolledToDomain(response.get());
121 PopulateInstallerBrandCode(response.get());
119 #endif 122 #endif
120 123
121 if (ProfileManager::GetLastUsedProfile()->IsChild()) 124 if (ProfileManager::GetLastUsedProfile()->IsChild())
122 (*response)["account_type"] = "child"; 125 (*response)["account_type"] = "child";
123 126
124 #if defined(OS_CHROMEOS) 127 #if defined(OS_CHROMEOS)
125 PopulateLocalStateSettings(response.get()); 128 PopulateLocalStateSettings(response.get());
126 129
127 // Get the HWID on the blocking pool and invoke the callback later when done. 130 // Get the HWID on the blocking pool and invoke the callback later when done.
128 SystemLogsResponse* response_ptr = response.release(); 131 SystemLogsResponse* response_ptr = response.release();
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 "No Keyboard:\n"; 242 "No Keyboard:\n";
240 (*response)[kUsbKeyboardDetected] += reason; 243 (*response)[kUsbKeyboardDetected] += reason;
241 } 244 }
242 245
243 void ChromeInternalLogSource::PopulateEnrolledToDomain( 246 void ChromeInternalLogSource::PopulateEnrolledToDomain(
244 SystemLogsResponse* response) { 247 SystemLogsResponse* response) {
245 (*response)[kIsEnrolledToDomain] = base::win::IsEnrolledToDomain() 248 (*response)[kIsEnrolledToDomain] = base::win::IsEnrolledToDomain()
246 ? "Enrolled to domain" 249 ? "Enrolled to domain"
247 : "Not enrolled to domain"; 250 : "Not enrolled to domain";
248 } 251 }
252
253 void ChromeInternalLogSource::PopulateInstallerBrandCode(
254 SystemLogsResponse* response) {
255 std::string brand;
256 google_brand::GetBrand(&brand);
257 (*response)[kInstallerBrandCode] =
258 brand.empty() ? "Unknown brand code" : brand;
259 }
249 #endif 260 #endif
250 261
251 } // namespace system_logs 262 } // namespace system_logs
OLDNEW
« no previous file with comments | « chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698