| 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 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 317 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 318 | 318 |
| 319 base::DictionaryValue* dict = new base::DictionaryValue(); | 319 base::DictionaryValue* dict = new base::DictionaryValue(); |
| 320 | 320 |
| 321 dict->SetString("version", GetContentClient()->GetProduct()); | 321 dict->SetString("version", GetContentClient()->GetProduct()); |
| 322 dict->SetString("command_line", | 322 dict->SetString("command_line", |
| 323 CommandLine::ForCurrentProcess()->GetCommandLineString()); | 323 CommandLine::ForCurrentProcess()->GetCommandLineString()); |
| 324 dict->SetString("operating_system", | 324 dict->SetString("operating_system", |
| 325 base::SysInfo::OperatingSystemName() + " " + | 325 base::SysInfo::OperatingSystemName() + " " + |
| 326 base::SysInfo::OperatingSystemVersion()); | 326 base::SysInfo::OperatingSystemVersion()); |
| 327 dict->SetString("angle_revision", base::UintToString(BUILD_REVISION)); | 327 dict->SetString("angle_commit_id", ANGLE_COMMIT_HASH); |
| 328 dict->SetString("graphics_backend", "Skia"); | 328 dict->SetString("graphics_backend", "Skia"); |
| 329 dict->SetString("blacklist_version", | 329 dict->SetString("blacklist_version", |
| 330 GpuDataManagerImpl::GetInstance()->GetBlacklistVersion()); | 330 GpuDataManagerImpl::GetInstance()->GetBlacklistVersion()); |
| 331 dict->SetString("driver_bug_list_version", | 331 dict->SetString("driver_bug_list_version", |
| 332 GpuDataManagerImpl::GetInstance()->GetDriverBugListVersion()); | 332 GpuDataManagerImpl::GetInstance()->GetDriverBugListVersion()); |
| 333 | 333 |
| 334 return dict; | 334 return dict; |
| 335 } | 335 } |
| 336 | 336 |
| 337 base::Value* GpuMessageHandler::OnRequestLogMessages(const base::ListValue*) { | 337 base::Value* GpuMessageHandler::OnRequestLogMessages(const base::ListValue*) { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 : WebUIController(web_ui) { | 374 : WebUIController(web_ui) { |
| 375 web_ui->AddMessageHandler(new GpuMessageHandler()); | 375 web_ui->AddMessageHandler(new GpuMessageHandler()); |
| 376 | 376 |
| 377 // Set up the chrome://gpu/ source. | 377 // Set up the chrome://gpu/ source. |
| 378 BrowserContext* browser_context = | 378 BrowserContext* browser_context = |
| 379 web_ui->GetWebContents()->GetBrowserContext(); | 379 web_ui->GetWebContents()->GetBrowserContext(); |
| 380 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); | 380 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); |
| 381 } | 381 } |
| 382 | 382 |
| 383 } // namespace content | 383 } // namespace content |
| OLD | NEW |