Append software rendering list version to the about:gpu page.

chrome/browser/ui/webui/gpu_internals_ui.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/gpu_internals_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 230 matching lines @@
   }
 }
 
 void GpuMessageHandler::OnBrowserBridgeInitialized(const ListValue* args) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DCHECK(!gpu_info_update_callback_);
 
   // 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
   // Gpu process has not run yet, this will trigger its launch.
   gpu_data_manager_->RequestCompleteGpuInfoIfNeeded();
 
   // Run callback immediately in case the info is ready and no update in the
   // future.
   OnGpuInfoUpdate();
 }
 
 Value* GpuMessageHandler::OnRequestClientInfo(const ListValue* list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DictionaryValue* dict = new DictionaryValue();
 
   chrome::VersionInfo version_info;
 
   if (!version_info.is_valid()) {
     DLOG(ERROR) << "Unable to create chrome::VersionInfo";
   } else {
     // We have everything we need to send the right values.
     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;
 }
 
 DictionaryValue* NewDescriptionValuePair(const std::string& desc,
     const std::string& value) {
   DictionaryValue* dict = new DictionaryValue();
   dict->SetString("description", desc);
   dict->SetString("value", value);
   return dict;
 }
@@ skipping 144 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 GpuInternalsUI::GpuInternalsUI(TabContents* contents) : WebUI(contents) {
   AddMessageHandler((new GpuMessageHandler())->Attach(this));
 
   GpuHTMLSource* html_source = new GpuHTMLSource();
 
   // Set up the chrome://gpu/ source.
   contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
 }