| Index: content/browser/gpu/gpu_data_manager_impl.h
|
| ===================================================================
|
| --- content/browser/gpu/gpu_data_manager_impl.h (revision 156051)
|
| +++ content/browser/gpu/gpu_data_manager_impl.h (working copy)
|
| @@ -38,6 +38,7 @@
|
| const std::string& gpu_blacklist_json,
|
| const content::GPUInfo& gpu_info) OVERRIDE;
|
| virtual content::GpuFeatureType GetBlacklistedFeatures() const OVERRIDE;
|
| + virtual content::GpuSwitchingOption GetGpuSwitchingOption() const OVERRIDE;
|
| virtual base::ListValue* GetBlacklistReasons() const OVERRIDE;
|
| virtual std::string GetBlacklistVersion() const OVERRIDE;
|
| virtual content::GPUInfo GetGPUInfo() const OVERRIDE;
|
| @@ -120,6 +121,8 @@
|
| content::GpuFeatureType gpu_feature_type_;
|
| content::GpuFeatureType preliminary_gpu_feature_type_;
|
|
|
| + content::GpuSwitchingOption gpu_switching_;
|
| +
|
| content::GPUInfo gpu_info_;
|
| mutable base::Lock gpu_info_lock_;
|
|
|
|
|