summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_about_handler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/browser_about_handler.cc')
-rw-r--r--chrome/browser/browser_about_handler.cc38
1 files changed, 24 insertions, 14 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 83b4bff..79775e6 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -772,28 +772,38 @@ std::string AboutGpu() {
html.append("</body></html> ");
} else {
html.append("<html><head><title>About GPU</title></head><body>\n");
- html.append("<h2>GPU Information</h2><ul>\n");
- html.append("<li><strong>Vendor ID:</strong> ");
+ html.append("<h2>GPU Information</h2>\n");
+ html.append("<table><tr>");
+ html.append("<td><strong>Initialization time</strong></td><td>");
+ html.append(base::Int64ToString(
+ gpu_info.initialization_time().InMilliseconds()));
+ html.append("</td></tr><tr><td>");
+ html.append("<strong>Vendor ID</strong></td><td>");
html.append(base::StringPrintf("0x%04x", gpu_info.vendor_id()));
- html.append("<li><strong>Device ID:</strong> ");
+ html.append("</td></tr><tr><td>");
+ html.append("<strong>Device ID</strong></td><td>");
html.append(base::StringPrintf("0x%04x", gpu_info.device_id()));
- html.append("<li><strong>Driver Version:</strong> ");
+ html.append("</td></tr><tr><td>");
+ html.append("<strong>Driver Version</strong></td><td>");
html.append(WideToASCII(gpu_info.driver_version()).c_str());
- html.append("<li><strong>Pixel Shader Version:</strong> ");
- html.append(VersionNumberToString(
- gpu_info.pixel_shader_version()).c_str());
- html.append("<li><strong>Vertex Shader Version:</strong> ");
+ html.append("</td></tr><tr><td>");
+ html.append("<strong>Pixel Shader Version</strong></td><td>");
+ html.append(VersionNumberToString(gpu_info.pixel_shader_version()).c_str());
+ html.append("</td></tr><tr><td>");
+ html.append("<strong>Vertex Shader Version</strong></td><td>");
html.append(VersionNumberToString(
- gpu_info.vertex_shader_version()).c_str());
- html.append("<li><strong>GL Version:</strong> ");
+ gpu_info.vertex_shader_version()).c_str());
+ html.append("</td></tr><tr><td>");
+ html.append("<strong>GL Version</strong></td><td>");
html.append(VersionNumberToString(gpu_info.gl_version()).c_str());
+ html.append("</td></tr></table>");
#if defined(OS_WIN)
- html.append("<li><strong>DirectX Diagnostics:</strong> ");
+ html.append("<h2>DirectX Diagnostics</h2>");
DxDiagNodeToHTML(&html, gpu_info.dx_diagnostics());
#endif
- html.append("</ul></body></html> ");
+ html.append("</body></html>");
}
return html;
}
@@ -1138,11 +1148,11 @@ bool WillHandleBrowserAboutURL(GURL* url, Profile* profile) {
// Handle URLs to wreck the gpu process.
if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutGpuCrashURL)) {
- GpuProcessHost::SendAboutGpuCrash();
+ GpuProcessHostUIShim::Get()->SendAboutGpuCrash();
return true;
}
if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutGpuHangURL)) {
- GpuProcessHost::SendAboutGpuHang();
+ GpuProcessHostUIShim::Get()->SendAboutGpuHang();
return true;
}