| Index: gpu/config/gpu_control_list.h
|
| diff --git a/gpu/config/gpu_control_list.h b/gpu/config/gpu_control_list.h
|
| index a5abf5236347bf0b6210c702265e4c427dd6103d..17d5ad91b4977c53fe08a610666f548ba85e444e 100644
|
| --- a/gpu/config/gpu_control_list.h
|
| +++ b/gpu/config/gpu_control_list.h
|
| @@ -336,8 +336,12 @@ class GPU_EXPORT GpuControlList {
|
|
|
| bool SetVendorId(const std::string& vendor_id_string);
|
|
|
| + void SetVendorString(const std::string& vendor_string);
|
| +
|
| bool AddDeviceId(const std::string& device_id_string);
|
|
|
| + void SetDeviceString(const std::string& device_string);
|
| +
|
| bool SetMultiGpuStyle(const std::string& multi_gpu_style_string);
|
|
|
| bool SetMultiGpuCategory(const std::string& multi_gpu_category_string);
|
| @@ -429,7 +433,9 @@ class GPU_EXPORT GpuControlList {
|
| std::vector<int> webkit_bugs_;
|
| scoped_ptr<OsInfo> os_info_;
|
| uint32 vendor_id_;
|
| + std::string vendor_string_;
|
| std::vector<uint32> device_id_list_;
|
| + std::string device_string_;
|
| MultiGpuStyle multi_gpu_style_;
|
| MultiGpuCategory multi_gpu_category_;
|
| GLType gl_type_;
|
| @@ -485,4 +491,3 @@ class GPU_EXPORT GpuControlList {
|
| } // namespace gpu
|
|
|
| #endif // GPU_CONFIG_GPU_CONTROL_LIST_H_
|
| -
|
|
|