Chromium Code Reviews| Index: gpu/config/gpu_info_collector_linux.cc |
| diff --git a/gpu/config/gpu_info_collector_linux.cc b/gpu/config/gpu_info_collector_linux.cc |
| index 9a21a2de09347b03b50b30c200447a61e8e39811..ce27f3bf10048a99f9a7aba104cb147861bddc7d 100644 |
| --- a/gpu/config/gpu_info_collector_linux.cc |
| +++ b/gpu/config/gpu_info_collector_linux.cc |
| @@ -17,7 +17,9 @@ |
| #include "base/strings/string_tokenizer.h" |
| #include "base/strings/string_util.h" |
| #include "gpu/config/gpu_info_collector.h" |
| +#if defined(USE_LIBPCI) |
|
dnicoara
2014/10/29 15:34:01
#ifdef-ed libraries should be the last included li
|
| #include "library_loaders/libpci.h" |
| +#endif |
| #include "ui/gl/gl_bindings.h" |
| #include "ui/gl/gl_context.h" |
| #include "ui/gl/gl_implementation.h" |
| @@ -72,6 +74,10 @@ const uint32 kVendorIDAMD = 0x1002; |
| CollectInfoResult CollectPCIVideoCardInfo(GPUInfo* gpu_info) { |
| DCHECK(gpu_info); |
| +#if !defined(USE_LIBPCI) |
| + return kCollectInfoNonFatalFailure; |
| +#else |
| + |
| if (IsPciSupported() == false) { |
| VLOG(1) << "PCI bus scanning is not supported"; |
| return kCollectInfoNonFatalFailure; |
| @@ -144,6 +150,7 @@ CollectInfoResult CollectPCIVideoCardInfo(GPUInfo* gpu_info) { |
| if (!primary_gpu_identified) |
| return kCollectInfoNonFatalFailure; |
| return kCollectInfoSuccess; |
| +#endif |
| } |
| } // namespace anonymous |