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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 basic_info->Append( | 132 basic_info->Append( |
133 NewDescriptionValuePair("Driver vendor", gpu_info.driver_vendor)); | 133 NewDescriptionValuePair("Driver vendor", gpu_info.driver_vendor)); |
134 basic_info->Append(NewDescriptionValuePair("Driver version", | 134 basic_info->Append(NewDescriptionValuePair("Driver version", |
135 gpu_info.driver_version)); | 135 gpu_info.driver_version)); |
136 basic_info->Append(NewDescriptionValuePair("Driver date", | 136 basic_info->Append(NewDescriptionValuePair("Driver date", |
137 gpu_info.driver_date)); | 137 gpu_info.driver_date)); |
138 basic_info->Append(NewDescriptionValuePair("Pixel shader version", | 138 basic_info->Append(NewDescriptionValuePair("Pixel shader version", |
139 gpu_info.pixel_shader_version)); | 139 gpu_info.pixel_shader_version)); |
140 basic_info->Append(NewDescriptionValuePair("Vertex shader version", | 140 basic_info->Append(NewDescriptionValuePair("Vertex shader version", |
141 gpu_info.vertex_shader_version)); | 141 gpu_info.vertex_shader_version)); |
142 basic_info->Append(NewDescriptionValuePair("Machine model", | 142 basic_info->Append(NewDescriptionValuePair("Machine model name", |
143 gpu_info.machine_model)); | 143 gpu_info.machine_model_name)); |
| 144 basic_info->Append(NewDescriptionValuePair("Machine model version", |
| 145 gpu_info.machine_model_version)); |
144 basic_info->Append(NewDescriptionValuePair("GL version", | 146 basic_info->Append(NewDescriptionValuePair("GL version", |
145 gpu_info.gl_version)); | 147 gpu_info.gl_version)); |
146 basic_info->Append(NewDescriptionValuePair("GL_VENDOR", | 148 basic_info->Append(NewDescriptionValuePair("GL_VENDOR", |
147 gpu_info.gl_vendor)); | 149 gpu_info.gl_vendor)); |
148 basic_info->Append(NewDescriptionValuePair("GL_RENDERER", | 150 basic_info->Append(NewDescriptionValuePair("GL_RENDERER", |
149 gpu_info.gl_renderer)); | 151 gpu_info.gl_renderer)); |
150 basic_info->Append(NewDescriptionValuePair("GL_VERSION", | 152 basic_info->Append(NewDescriptionValuePair("GL_VERSION", |
151 gpu_info.gl_version_string)); | 153 gpu_info.gl_version_string)); |
152 basic_info->Append(NewDescriptionValuePair("GL_EXTENSIONS", | 154 basic_info->Append(NewDescriptionValuePair("GL_EXTENSIONS", |
153 gpu_info.gl_extensions)); | 155 gpu_info.gl_extensions)); |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 : WebUIController(web_ui) { | 380 : WebUIController(web_ui) { |
379 web_ui->AddMessageHandler(new GpuMessageHandler()); | 381 web_ui->AddMessageHandler(new GpuMessageHandler()); |
380 | 382 |
381 // Set up the chrome://gpu/ source. | 383 // Set up the chrome://gpu/ source. |
382 BrowserContext* browser_context = | 384 BrowserContext* browser_context = |
383 web_ui->GetWebContents()->GetBrowserContext(); | 385 web_ui->GetWebContents()->GetBrowserContext(); |
384 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); | 386 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); |
385 } | 387 } |
386 | 388 |
387 } // namespace content | 389 } // namespace content |
OLD | NEW |