OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "gpu/config/gpu_info_collector_linux.h" | 5 #include "gpu/config/gpu_info_collector_linux.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | |
no sievers
2016/04/05 19:02:42
unused
Mostyn Bramley-Moore
2016/04/05 21:35:32
Fixed.
| |
10 #include <vector> | 11 #include <vector> |
11 | 12 |
12 #include "base/command_line.h" | 13 #include "base/command_line.h" |
13 #include "base/files/file_util.h" | 14 #include "base/files/file_util.h" |
14 #include "base/logging.h" | 15 #include "base/logging.h" |
15 #include "base/memory/scoped_ptr.h" | |
16 #include "base/message_loop/message_loop.h" | 16 #include "base/message_loop/message_loop.h" |
17 #include "base/strings/string_piece.h" | 17 #include "base/strings/string_piece.h" |
18 #include "base/strings/string_split.h" | 18 #include "base/strings/string_split.h" |
19 #include "base/strings/string_tokenizer.h" | 19 #include "base/strings/string_tokenizer.h" |
20 #include "base/strings/string_util.h" | 20 #include "base/strings/string_util.h" |
21 #include "base/trace_event/trace_event.h" | 21 #include "base/trace_event/trace_event.h" |
22 #include "gpu/config/gpu_info_collector.h" | 22 #include "gpu/config/gpu_info_collector.h" |
23 #include "ui/gl/gl_bindings.h" | 23 #include "ui/gl/gl_bindings.h" |
24 #include "ui/gl/gl_context.h" | 24 #include "ui/gl/gl_context.h" |
25 #include "ui/gl/gl_implementation.h" | 25 #include "ui/gl/gl_implementation.h" |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
269 gpu_info->driver_version = driver_version; | 269 gpu_info->driver_version = driver_version; |
270 return kCollectInfoSuccess; | 270 return kCollectInfoSuccess; |
271 } | 271 } |
272 | 272 |
273 void MergeGPUInfo(GPUInfo* basic_gpu_info, | 273 void MergeGPUInfo(GPUInfo* basic_gpu_info, |
274 const GPUInfo& context_gpu_info) { | 274 const GPUInfo& context_gpu_info) { |
275 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 275 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
276 } | 276 } |
277 | 277 |
278 } // namespace gpu | 278 } // namespace gpu |
OLD | NEW |