Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(345)

Side by Side Diff: gpu/config/gpu_info_collector_mac.mm

Issue 16632010: Use a direct include of strings headers in extensions/, google_apis/, gpu/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « gpu/config/gpu_info_collector_android.cc ('k') | gpu/config/gpu_info_collector_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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.h" 5 #include "gpu/config/gpu_info_collector.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/mac/mac_util.h" 11 #include "base/mac/mac_util.h"
12 #include "base/mac/scoped_cftyperef.h" 12 #include "base/mac/scoped_cftyperef.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/string_util.h"
16 #include "base/strings/string_piece.h" 15 #include "base/strings/string_piece.h"
16 #include "base/strings/string_util.h"
17 #include "base/strings/sys_string_conversions.h" 17 #include "base/strings/sys_string_conversions.h"
18 #include "ui/gl/gl_bindings.h" 18 #include "ui/gl/gl_bindings.h"
19 #include "ui/gl/gl_context.h" 19 #include "ui/gl/gl_context.h"
20 #include "ui/gl/gl_implementation.h" 20 #include "ui/gl/gl_implementation.h"
21 #include "ui/gl/gl_interface.h" 21 #include "ui/gl/gl_interface.h"
22 22
23 #import <Cocoa/Cocoa.h> 23 #import <Cocoa/Cocoa.h>
24 #import <Foundation/Foundation.h> 24 #import <Foundation/Foundation.h>
25 #import <IOKit/IOKitLib.h> 25 #import <IOKit/IOKitLib.h>
26 26
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 gpu_info->driver_version = gl_version_string.substr(pos + 1); 211 gpu_info->driver_version = gl_version_string.substr(pos + 1);
212 return true; 212 return true;
213 } 213 }
214 214
215 void MergeGPUInfo(GPUInfo* basic_gpu_info, 215 void MergeGPUInfo(GPUInfo* basic_gpu_info,
216 const GPUInfo& context_gpu_info) { 216 const GPUInfo& context_gpu_info) {
217 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); 217 MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
218 } 218 }
219 219
220 } // namespace gpu 220 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/config/gpu_info_collector_android.cc ('k') | gpu/config/gpu_info_collector_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698