| 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 #if defined(OS_LINUX) && defined(USE_X11) | 7 #if defined(OS_LINUX) && defined(USE_X11) |
| 8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 basic_info->Append( | 147 basic_info->Append( |
| 148 NewDescriptionValuePair("Driver vendor", gpu_info.driver_vendor)); | 148 NewDescriptionValuePair("Driver vendor", gpu_info.driver_vendor)); |
| 149 basic_info->Append(NewDescriptionValuePair("Driver version", | 149 basic_info->Append(NewDescriptionValuePair("Driver version", |
| 150 gpu_info.driver_version)); | 150 gpu_info.driver_version)); |
| 151 basic_info->Append(NewDescriptionValuePair("Driver date", | 151 basic_info->Append(NewDescriptionValuePair("Driver date", |
| 152 gpu_info.driver_date)); | 152 gpu_info.driver_date)); |
| 153 basic_info->Append(NewDescriptionValuePair("Pixel shader version", | 153 basic_info->Append(NewDescriptionValuePair("Pixel shader version", |
| 154 gpu_info.pixel_shader_version)); | 154 gpu_info.pixel_shader_version)); |
| 155 basic_info->Append(NewDescriptionValuePair("Vertex shader version", | 155 basic_info->Append(NewDescriptionValuePair("Vertex shader version", |
| 156 gpu_info.vertex_shader_version)); | 156 gpu_info.vertex_shader_version)); |
| 157 basic_info->Append(NewDescriptionValuePair("Max. MSAA samples", |
| 158 gpu_info.max_msaa_samples)); |
| 157 basic_info->Append(NewDescriptionValuePair("Machine model name", | 159 basic_info->Append(NewDescriptionValuePair("Machine model name", |
| 158 gpu_info.machine_model_name)); | 160 gpu_info.machine_model_name)); |
| 159 basic_info->Append(NewDescriptionValuePair("Machine model version", | 161 basic_info->Append(NewDescriptionValuePair("Machine model version", |
| 160 gpu_info.machine_model_version)); | 162 gpu_info.machine_model_version)); |
| 161 basic_info->Append(NewDescriptionValuePair("GL_VENDOR", | 163 basic_info->Append(NewDescriptionValuePair("GL_VENDOR", |
| 162 gpu_info.gl_vendor)); | 164 gpu_info.gl_vendor)); |
| 163 basic_info->Append(NewDescriptionValuePair("GL_RENDERER", | 165 basic_info->Append(NewDescriptionValuePair("GL_RENDERER", |
| 164 gpu_info.gl_renderer)); | 166 gpu_info.gl_renderer)); |
| 165 basic_info->Append(NewDescriptionValuePair("GL_VERSION", | 167 basic_info->Append(NewDescriptionValuePair("GL_VERSION", |
| 166 gpu_info.gl_version)); | 168 gpu_info.gl_version)); |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 : WebUIController(web_ui) { | 420 : WebUIController(web_ui) { |
| 419 web_ui->AddMessageHandler(new GpuMessageHandler()); | 421 web_ui->AddMessageHandler(new GpuMessageHandler()); |
| 420 | 422 |
| 421 // Set up the chrome://gpu/ source. | 423 // Set up the chrome://gpu/ source. |
| 422 BrowserContext* browser_context = | 424 BrowserContext* browser_context = |
| 423 web_ui->GetWebContents()->GetBrowserContext(); | 425 web_ui->GetWebContents()->GetBrowserContext(); |
| 424 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); | 426 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); |
| 425 } | 427 } |
| 426 | 428 |
| 427 } // namespace content | 429 } // namespace content |
| OLD | NEW |