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

Side by Side Diff: chrome/browser/gpu_util.cc

Issue 10683005: Remove two deprecated methods from base::Version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 8 years, 5 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
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 "chrome/browser/gpu_util.h" 5 #include "chrome/browser/gpu_util.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 } 133 }
134 134
135 int GetGpuBlacklistHistogramValueWin(GpuFeatureStatus status) { 135 int GetGpuBlacklistHistogramValueWin(GpuFeatureStatus status) {
136 static WinSubVersion sub_version = kNumWinSubVersions; 136 static WinSubVersion sub_version = kNumWinSubVersions;
137 if (sub_version == kNumWinSubVersions) { 137 if (sub_version == kNumWinSubVersions) {
138 sub_version = kWinOthers; 138 sub_version = kWinOthers;
139 std::string version_str = base::SysInfo::OperatingSystemVersion(); 139 std::string version_str = base::SysInfo::OperatingSystemVersion();
140 size_t pos = version_str.find_first_not_of("0123456789."); 140 size_t pos = version_str.find_first_not_of("0123456789.");
141 if (pos != std::string::npos) 141 if (pos != std::string::npos)
142 version_str = version_str.substr(0, pos); 142 version_str = version_str.substr(0, pos);
143 scoped_ptr<Version> os_version(Version::GetVersionFromString(version_str)); 143 Version os_version(version_str);
144 if (os_version.get() && os_version->components().size() >= 2) { 144 if (os_version.IsValid() && os_version.components().size() >= 2) {
145 const std::vector<uint16>& version_numbers = os_version->components(); 145 const std::vector<uint16>& version_numbers = os_version.components();
146 if (version_numbers[0] == 5) 146 if (version_numbers[0] == 5)
147 sub_version = kWinXP; 147 sub_version = kWinXP;
148 else if (version_numbers[0] == 6 && version_numbers[1] == 0) 148 else if (version_numbers[0] == 6 && version_numbers[1] == 0)
149 sub_version = kWinVista; 149 sub_version = kWinVista;
150 else if (version_numbers[0] == 6 && version_numbers[1] == 1) 150 else if (version_numbers[0] == 6 && version_numbers[1] == 1)
151 sub_version = kWin7; 151 sub_version = kWin7;
152 } 152 }
153 } 153 }
154 int entry_index = static_cast<int>(sub_version) * kGpuFeatureNumStatus; 154 int entry_index = static_cast<int>(sub_version) * kGpuFeatureNumStatus;
155 switch (status) { 155 switch (status) {
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 kGpuBlacklistFeatureHistogramNamesWin[i], 573 kGpuBlacklistFeatureHistogramNamesWin[i],
574 1, kNumWinSubVersions * kGpuFeatureNumStatus, 574 1, kNumWinSubVersions * kGpuFeatureNumStatus,
575 kNumWinSubVersions * kGpuFeatureNumStatus + 1, 575 kNumWinSubVersions * kGpuFeatureNumStatus + 1,
576 base::Histogram::kUmaTargetedHistogramFlag); 576 base::Histogram::kUmaTargetedHistogramFlag);
577 histogram_pointer->Add(GetGpuBlacklistHistogramValueWin(value)); 577 histogram_pointer->Add(GetGpuBlacklistHistogramValueWin(value));
578 #endif 578 #endif
579 } 579 }
580 } 580 }
581 581
582 } // namespace gpu_util; 582 } // namespace gpu_util;
OLDNEW
« no previous file with comments | « chrome/browser/gpu_blacklist_unittest.cc ('k') | chrome/browser/hang_monitor/hung_plugin_action.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698