Change GPUInfo to handle multiple GPUs.

content/public/common/gpu_info.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_GPU_INFO_H_
 #define CONTENT_PUBLIC_COMMON_GPU_INFO_H_
 #pragma once
 
 // Provides access to the GPU information for the system
 // on which chrome is currently running.
 
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "content/public/common/dx_diag_node.h"
 #include "content/public/common/gpu_performance_stats.h"
 
 namespace content {
 
 struct CONTENT_EXPORT GPUInfo {
+  struct CONTENT_EXPORT GPUDevice {
+    GPUDevice();
+    ~GPUDevice();
+
+    // The DWORD (uint32) representing the graphics card vendor id.
+    uint32 vendor_id;
+
+    // The DWORD (uint32) representing the graphics card device id.
+    // Device ids are unique to vendor, not to one another.
+    uint32 device_id;
+
+    // The strings that describe the GPU.
+    // In Linux these strings are obtained through libpci.
+    // In Win/MacOSX, these two strings are not filled at the moment.
+    std::string vendor_string;
+    std::string device_string;
+  };
+
   GPUInfo();
   ~GPUInfo();
 
   // Whether more GPUInfo fields might be collected in the future.
   bool finalized;
 
   // The amount of time taken to get from the process starting to the message
   // loop being pumped.
   base::TimeDelta initialization_time;
 
   // Computer has NVIDIA Optimus
   bool optimus;
 
   // Computer has AMD Dynamic Switchable Graphics
   bool amd_switchable;
 
-  // The DWORD (uint32) representing the graphics card vendor id.
-  uint32 vendor_id;
+  // Primary GPU, for exmaple, the discrete GPU in a dual GPU machine.
+  GPUDevice gpu;
 
-  // The DWORD (uint32) representing the graphics card device id.  Device ids
-  // are unique to vendor, not to one another.
-  uint32 device_id;
+  // Secondary GPUs, for example, the integrated GPU in a dual GPU machine.
+  std::vector<GPUDevice> secondary_gpus;
 
   // The vendor of the graphics driver currently installed.
   std::string driver_vendor;
 
   // The version of the graphics driver currently installed.
   std::string driver_version;
 
   // The date of the graphics driver currently installed.
   std::string driver_date;
 
@@ skipping 33 matching lines @@
 
 #if defined(OS_WIN)
   // The information returned by the DirectX Diagnostics Tool.
   DxDiagNode dx_diagnostics;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_GPU_INFO_H_