OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/dom_ui/gpu_internals_ui.h" | 5 #include "chrome/browser/dom_ui/gpu_internals_ui.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 basic_info->Append(NewDescriptionValuePair("Vertex shader version", | 288 basic_info->Append(NewDescriptionValuePair("Vertex shader version", |
289 VersionNumberToString(gpu_info.vertex_shader_version()))); | 289 VersionNumberToString(gpu_info.vertex_shader_version()))); |
290 basic_info->Append(NewDescriptionValuePair("GL version", | 290 basic_info->Append(NewDescriptionValuePair("GL version", |
291 VersionNumberToString(gpu_info.gl_version()))); | 291 VersionNumberToString(gpu_info.gl_version()))); |
292 basic_info->Append(NewDescriptionValuePair("GL_VENDOR", | 292 basic_info->Append(NewDescriptionValuePair("GL_VENDOR", |
293 gpu_info.gl_vendor())); | 293 gpu_info.gl_vendor())); |
294 basic_info->Append(NewDescriptionValuePair("GL_RENDERER", | 294 basic_info->Append(NewDescriptionValuePair("GL_RENDERER", |
295 gpu_info.gl_renderer())); | 295 gpu_info.gl_renderer())); |
296 basic_info->Append(NewDescriptionValuePair("GL_VERSION", | 296 basic_info->Append(NewDescriptionValuePair("GL_VERSION", |
297 gpu_info.gl_version_string())); | 297 gpu_info.gl_version_string())); |
298 basic_info->Append(NewDescriptionValuePair("GL_EXTENSIONS", | |
299 gpu_info.gl_extensions())); | |
300 | 298 |
301 DictionaryValue* info = new DictionaryValue(); | 299 DictionaryValue* info = new DictionaryValue(); |
302 info->Set("basic_info", basic_info); | 300 info->Set("basic_info", basic_info); |
303 | 301 |
304 if (gpu_info.progress() == GPUInfo::kPartial) { | 302 if (gpu_info.progress() == GPUInfo::kPartial) { |
305 info->SetString("progress", "partial"); | 303 info->SetString("progress", "partial"); |
306 } else { | 304 } else { |
307 info->SetString("progress", "complete"); | 305 info->SetString("progress", "complete"); |
308 } | 306 } |
309 #if defined(OS_WIN) | 307 #if defined(OS_WIN) |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 | 348 |
351 // Set up the chrome://gpu/ source. | 349 // Set up the chrome://gpu/ source. |
352 BrowserThread::PostTask( | 350 BrowserThread::PostTask( |
353 BrowserThread::IO, FROM_HERE, | 351 BrowserThread::IO, FROM_HERE, |
354 NewRunnableMethod( | 352 NewRunnableMethod( |
355 ChromeURLDataManager::GetInstance(), | 353 ChromeURLDataManager::GetInstance(), |
356 &ChromeURLDataManager::AddDataSource, | 354 &ChromeURLDataManager::AddDataSource, |
357 make_scoped_refptr(html_source))); | 355 make_scoped_refptr(html_source))); |
358 } | 356 } |
359 | 357 |
OLD | NEW |