5 files changed, 34 insertions, 8 deletions
diff --git a/chrome/browser/gpu_data_manager.cc b/chrome/browser/gpu_data_manager.cc
index f86253d..215c2d3 100644
--- a/chrome/browser/gpu_data_manager.cc
+++ b/chrome/browser/gpu_data_manager.cc
@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
+#include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/gpu_process_host_ui_shim.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -93,6 +94,21 @@ Value* GpuDataManager::GetBlacklistingReasons() const {
   return NULL;
 }
 
+std::string GpuDataManager::GetBlacklistVersion() const {
+  if (gpu_blacklist_.get() != NULL) {
+    uint16 version_major, version_minor;
+    if (gpu_blacklist_->GetVersion(&version_major,
+                                   &version_minor)) {
+      std::string version_string =
+          base::UintToString(static_cast<unsigned>(version_major)) +
+          "." +
+          base::UintToString(static_cast<unsigned>(version_minor));
+      return version_string;
+    }
+  }
+  return "";
+}
+
 void GpuDataManager::AddLogMessage(Value* msg) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   log_messages_.Append(msg);
diff --git a/chrome/browser/gpu_data_manager.h b/chrome/browser/gpu_data_manager.h
index 8d9b096..ade4279 100644
--- a/chrome/browser/gpu_data_manager.h
+++ b/chrome/browser/gpu_data_manager.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <set>
+#include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
@@ -37,6 +38,8 @@ class GpuDataManager {
   // if not blacklisted. Caller is responsible for deleting returned value.
   Value* GetBlacklistingReasons() const;
 
+  std::string GetBlacklistVersion() const;
+
   void AddLogMessage(Value* msg);
 
   const ListValue& log_messages() const;
diff --git a/chrome/browser/resources/gpu_internals/info_view.html b/chrome/browser/resources/gpu_internals/info_view.html
index c7b036b..c76f31c 100644
--- a/chrome/browser/resources/gpu_internals/info_view.html
+++ b/chrome/browser/resources/gpu_internals/info_view.html
@@ -4,7 +4,7 @@ Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->
 <div id=info-view label="GPU Info">
-  <h3>Chrome Version</h3>
+  <h3>Version Information</h3>
   <div id="client-info"></div>
 
   <div class="blacklisted-indicator">
diff --git a/chrome/browser/resources/gpu_internals/info_view.js b/chrome/browser/resources/gpu_internals/info_view.js
index 26a193f..bd62909 100644
--- a/chrome/browser/resources/gpu_internals/info_view.js
+++ b/chrome/browser/resources/gpu_internals/info_view.js
@@ -79,6 +79,10 @@ cr.define('gpu', function() {
           {
             description: 'Chrome version',
             value: chromeVersion
+          },
+          {
+            description: 'Software rendering list version',
+            value: this.clientInfo_.blacklist_version
           }]);
       } else {
         this.setText_('client-info', '... loading...');
diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc
index d74ba70..216c5c8 100644
--- a/chrome/browser/ui/webui/gpu_internals_ui.cc
+++ b/chrome/browser/ui/webui/gpu_internals_ui.cc
@@ -248,7 +248,7 @@ void GpuMessageHandler::OnBrowserBridgeInitialized(const ListValue* args) {
 
   // 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 @@ Value* GpuMessageHandler::OnRequestClientInfo(const ListValue* list) {
     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;
 }