| Index: chrome/browser/ui/webui/gpu_internals_ui.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/gpu_internals_ui.cc (revision 80377)
|
| +++ chrome/browser/ui/webui/gpu_internals_ui.cc (working copy)
|
| @@ -248,7 +248,7 @@
|
|
|
| // Watch for changes in GPUInfo
|
| gpu_info_update_callback_ =
|
| - NewCallback(this, &GpuMessageHandler::OnGpuInfoUpdate);
|
| + NewCallback(this, &GpuMessageHandler::OnGpuInfoUpdate);
|
| gpu_data_manager_->AddGpuInfoUpdateCallback(gpu_info_update_callback_);
|
|
|
| // Tell GpuDataManager it should have full GpuInfo. If the
|
| @@ -274,17 +274,20 @@
|
| dict->SetString("version", version_info.Version());
|
| dict->SetString("cl", version_info.LastChange());
|
| dict->SetString("version_mod",
|
| - platform_util::GetVersionStringModifier());
|
| + platform_util::GetVersionStringModifier());
|
| dict->SetString("official",
|
| - l10n_util::GetStringUTF16(
|
| - version_info.IsOfficialBuild() ?
|
| - IDS_ABOUT_VERSION_OFFICIAL
|
| - : IDS_ABOUT_VERSION_UNOFFICIAL));
|
| + l10n_util::GetStringUTF16(
|
| + version_info.IsOfficialBuild() ?
|
| + IDS_ABOUT_VERSION_OFFICIAL :
|
| + IDS_ABOUT_VERSION_UNOFFICIAL));
|
|
|
| dict->SetString("command_line",
|
| - CommandLine::ForCurrentProcess()->command_line_string());
|
| + CommandLine::ForCurrentProcess()->command_line_string());
|
| }
|
|
|
| + dict->SetString("blacklist_version",
|
| + GpuDataManager::GetInstance()->GetBlacklistVersion());
|
| +
|
| return dict;
|
| }
|
|
|
|
|