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

Side by Side Diff: content/gpu/gpu_info_collector_android.cc

Issue 13892006: content: Update the include paths of base/string_piece.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « content/gpu/gpu_info_collector.cc ('k') | content/gpu/gpu_info_collector_linux.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 "content/gpu/gpu_info_collector.h" 5 #include "content/gpu/gpu_info_collector.h"
6 6
7 #include "base/android/build_info.h" 7 #include "base/android/build_info.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
11 #include "base/string_piece.h"
12 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/strings/string_piece.h"
13 #include "base/strings/string_split.h" 13 #include "base/strings/string_split.h"
14 #include "cc/base/switches.h" 14 #include "cc/base/switches.h"
15 #include "content/public/common/content_switches.h" 15 #include "content/public/common/content_switches.h"
16 #include "ui/gfx/android/device_display_info.h" 16 #include "ui/gfx/android/device_display_info.h"
17 17
18 namespace { 18 namespace {
19 19
20 std::string GetDriverVersionFromString(const std::string& version_string) { 20 std::string GetDriverVersionFromString(const std::string& version_string) {
21 // Extract driver version from the second number in a string like: 21 // Extract driver version from the second number in a string like:
22 // "OpenGL ES 2.0 V@6.0 AU@ (CL@2946718)" 22 // "OpenGL ES 2.0 V@6.0 AU@ (CL@2946718)"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 gpu_info->gl_version_string); 147 gpu_info->gl_version_string);
148 return true; 148 return true;
149 } 149 }
150 150
151 void MergeGPUInfo(content::GPUInfo* basic_gpu_info, 151 void MergeGPUInfo(content::GPUInfo* basic_gpu_info,
152 const content::GPUInfo& context_gpu_info) { 152 const content::GPUInfo& context_gpu_info) {
153 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); 153 MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
154 } 154 }
155 155
156 } // namespace gpu_info_collector 156 } // namespace gpu_info_collector
OLDNEW
« no previous file with comments | « content/gpu/gpu_info_collector.cc ('k') | content/gpu/gpu_info_collector_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698