OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/gpu/gpu_internals_ui.h" | 5 #include "content/browser/gpu/gpu_internals_ui.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 } | 120 } |
121 if (gpu_info.display_link_version.IsValid()) { | 121 if (gpu_info.display_link_version.IsValid()) { |
122 basic_info->Append(NewDescriptionValuePair( | 122 basic_info->Append(NewDescriptionValuePair( |
123 "DisplayLink Version", gpu_info.display_link_version.GetString())); | 123 "DisplayLink Version", gpu_info.display_link_version.GetString())); |
124 } | 124 } |
125 #if defined(OS_WIN) | 125 #if defined(OS_WIN) |
126 std::string compositor = | 126 std::string compositor = |
127 ui::win::IsAeroGlassEnabled() ? "Aero Glass" : "none"; | 127 ui::win::IsAeroGlassEnabled() ? "Aero Glass" : "none"; |
128 basic_info->Append( | 128 basic_info->Append( |
129 NewDescriptionValuePair("Desktop compositing", compositor)); | 129 NewDescriptionValuePair("Desktop compositing", compositor)); |
| 130 if (GpuDataManagerImpl::GetInstance()->ShouldUseWarp()) { |
| 131 basic_info->Append(NewDescriptionValuePair("Using WARP", |
| 132 new base::FundamentalValue(true))); |
| 133 } |
130 #endif | 134 #endif |
131 | 135 |
132 basic_info->Append( | 136 basic_info->Append( |
133 NewDescriptionValuePair("Driver vendor", gpu_info.driver_vendor)); | 137 NewDescriptionValuePair("Driver vendor", gpu_info.driver_vendor)); |
134 basic_info->Append(NewDescriptionValuePair("Driver version", | 138 basic_info->Append(NewDescriptionValuePair("Driver version", |
135 gpu_info.driver_version)); | 139 gpu_info.driver_version)); |
136 basic_info->Append(NewDescriptionValuePair("Driver date", | 140 basic_info->Append(NewDescriptionValuePair("Driver date", |
137 gpu_info.driver_date)); | 141 gpu_info.driver_date)); |
138 basic_info->Append(NewDescriptionValuePair("Pixel shader version", | 142 basic_info->Append(NewDescriptionValuePair("Pixel shader version", |
139 gpu_info.pixel_shader_version)); | 143 gpu_info.pixel_shader_version)); |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 : WebUIController(web_ui) { | 386 : WebUIController(web_ui) { |
383 web_ui->AddMessageHandler(new GpuMessageHandler()); | 387 web_ui->AddMessageHandler(new GpuMessageHandler()); |
384 | 388 |
385 // Set up the chrome://gpu/ source. | 389 // Set up the chrome://gpu/ source. |
386 BrowserContext* browser_context = | 390 BrowserContext* browser_context = |
387 web_ui->GetWebContents()->GetBrowserContext(); | 391 web_ui->GetWebContents()->GetBrowserContext(); |
388 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); | 392 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); |
389 } | 393 } |
390 | 394 |
391 } // namespace content | 395 } // namespace content |
OLD | NEW |