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

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

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
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/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/sys_info.h" 9 #include "base/sys_info.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" 11 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
12 #include "chrome/browser/profiles/profile_manager.h" 12 #include "chrome/browser/profiles/profile_manager.h"
13 #include "chrome/browser/sync/about_sync_util.h" 13 #include "chrome/browser/sync/about_sync_util.h"
14 #include "chrome/browser/sync/profile_sync_service_factory.h" 14 #include "chrome/browser/sync/profile_sync_service_factory.h"
15 #include "chrome/common/chrome_version_info.h" 15 #include "chrome/common/channel_info.h"
16 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_ names.h" 16 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_ names.h"
17 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
18 #include "extensions/browser/extension_registry.h" 18 #include "extensions/browser/extension_registry.h"
19 #include "extensions/common/extension.h" 19 #include "extensions/common/extension.h"
20 #include "extensions/common/extension_set.h" 20 #include "extensions/common/extension_set.h"
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #include "base/win/win_util.h" 23 #include "base/win/win_util.h"
24 #endif 24 #endif
25 25
(...skipping 20 matching lines...) Expand all
46 46
47 ChromeInternalLogSource::~ChromeInternalLogSource() { 47 ChromeInternalLogSource::~ChromeInternalLogSource() {
48 } 48 }
49 49
50 void ChromeInternalLogSource::Fetch(const SysLogsSourceCallback& callback) { 50 void ChromeInternalLogSource::Fetch(const SysLogsSourceCallback& callback) {
51 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 51 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
52 DCHECK(!callback.is_null()); 52 DCHECK(!callback.is_null());
53 53
54 SystemLogsResponse response; 54 SystemLogsResponse response;
55 55
56 chrome::VersionInfo version_info; 56 response[kChromeVersionTag] = chrome::GetVersionString();
57 response[kChromeVersionTag] = version_info.CreateVersionString();
58 57
59 #if !defined(OS_CHROMEOS) 58 #if !defined(OS_CHROMEOS)
60 // On ChromeOS, this will be pulled in from the LSB_RELEASE. 59 // On ChromeOS, this will be pulled in from the LSB_RELEASE.
61 std::string os_version = base::SysInfo::OperatingSystemName() + ": " + 60 std::string os_version = base::SysInfo::OperatingSystemName() + ": " +
62 base::SysInfo::OperatingSystemVersion(); 61 base::SysInfo::OperatingSystemVersion();
63 response[kOsVersionTag] = os_version; 62 response[kOsVersionTag] = os_version;
64 #endif 63 #endif
65 64
66 PopulateSyncLogs(&response); 65 PopulateSyncLogs(&response);
67 PopulateExtensionInfoLogs(&response); 66 PopulateExtensionInfoLogs(&response);
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 SystemLogsResponse* response) { 157 SystemLogsResponse* response) {
159 std::string reason; 158 std::string reason;
160 bool result = base::win::IsKeyboardPresentOnSlate(&reason); 159 bool result = base::win::IsKeyboardPresentOnSlate(&reason);
161 (*response)[kUsbKeyboardDetected] = result ? "Keyboard Detected:\n" : 160 (*response)[kUsbKeyboardDetected] = result ? "Keyboard Detected:\n" :
162 "No Keyboard:\n"; 161 "No Keyboard:\n";
163 (*response)[kUsbKeyboardDetected] += reason; 162 (*response)[kUsbKeyboardDetected] += reason;
164 } 163 }
165 #endif 164 #endif
166 165
167 } // namespace system_logs 166 } // namespace system_logs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698