| 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 basic_info->Append(NewDescriptionValuePair("GL_VERSION", | 150 basic_info->Append(NewDescriptionValuePair("GL_VERSION", |
| 151 gpu_info.gl_version_string)); | 151 gpu_info.gl_version_string)); |
| 152 basic_info->Append(NewDescriptionValuePair("GL_EXTENSIONS", | 152 basic_info->Append(NewDescriptionValuePair("GL_EXTENSIONS", |
| 153 gpu_info.gl_extensions)); | 153 gpu_info.gl_extensions)); |
| 154 basic_info->Append(NewDescriptionValuePair("Window system binding vendor", | 154 basic_info->Append(NewDescriptionValuePair("Window system binding vendor", |
| 155 gpu_info.gl_ws_vendor)); | 155 gpu_info.gl_ws_vendor)); |
| 156 basic_info->Append(NewDescriptionValuePair("Window system binding version", | 156 basic_info->Append(NewDescriptionValuePair("Window system binding version", |
| 157 gpu_info.gl_ws_version)); | 157 gpu_info.gl_ws_version)); |
| 158 basic_info->Append(NewDescriptionValuePair("Window system binding extensions", | 158 basic_info->Append(NewDescriptionValuePair("Window system binding extensions", |
| 159 gpu_info.gl_ws_extensions)); | 159 gpu_info.gl_ws_extensions)); |
| 160 std::string direct_rendering = gpu_info.direct_rendering ? "Yes" : "No"; |
| 161 basic_info->Append( |
| 162 NewDescriptionValuePair("Direct rendering", direct_rendering)); |
| 163 |
| 160 std::string reset_strategy = | 164 std::string reset_strategy = |
| 161 base::StringPrintf("0x%04x", gpu_info.gl_reset_notification_strategy); | 165 base::StringPrintf("0x%04x", gpu_info.gl_reset_notification_strategy); |
| 162 basic_info->Append(NewDescriptionValuePair( | 166 basic_info->Append(NewDescriptionValuePair( |
| 163 "Reset notification strategy", reset_strategy)); | 167 "Reset notification strategy", reset_strategy)); |
| 164 | 168 |
| 165 base::DictionaryValue* info = new base::DictionaryValue(); | 169 base::DictionaryValue* info = new base::DictionaryValue(); |
| 166 info->Set("basic_info", basic_info); | 170 info->Set("basic_info", basic_info); |
| 167 | 171 |
| 168 #if defined(OS_WIN) | 172 #if defined(OS_WIN) |
| 169 base::ListValue* perf_info = new base::ListValue(); | 173 base::ListValue* perf_info = new base::ListValue(); |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 : WebUIController(web_ui) { | 378 : WebUIController(web_ui) { |
| 375 web_ui->AddMessageHandler(new GpuMessageHandler()); | 379 web_ui->AddMessageHandler(new GpuMessageHandler()); |
| 376 | 380 |
| 377 // Set up the chrome://gpu/ source. | 381 // Set up the chrome://gpu/ source. |
| 378 BrowserContext* browser_context = | 382 BrowserContext* browser_context = |
| 379 web_ui->GetWebContents()->GetBrowserContext(); | 383 web_ui->GetWebContents()->GetBrowserContext(); |
| 380 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); | 384 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); |
| 381 } | 385 } |
| 382 | 386 |
| 383 } // namespace content | 387 } // namespace content |
| OLD | NEW |