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

Side by Side Diff: content/public/common/webplugininfo.cc

Issue 1272823003: Update SplitString calls to new form (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/public/common/webplugininfo.h" 5 #include "content/public/common/webplugininfo.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 std::string version = base::UTF16ToASCII(version_string); 76 std::string version = base::UTF16ToASCII(version_string);
77 base::RemoveChars(version, ") ", &version); 77 base::RemoveChars(version, ") ", &version);
78 std::replace(version.begin(), version.end(), 'd', '.'); 78 std::replace(version.begin(), version.end(), 'd', '.');
79 std::replace(version.begin(), version.end(), 'r', '.'); 79 std::replace(version.begin(), version.end(), 'r', '.');
80 std::replace(version.begin(), version.end(), ',', '.'); 80 std::replace(version.begin(), version.end(), ',', '.');
81 std::replace(version.begin(), version.end(), '(', '.'); 81 std::replace(version.begin(), version.end(), '(', '.');
82 std::replace(version.begin(), version.end(), '_', '.'); 82 std::replace(version.begin(), version.end(), '_', '.');
83 83
84 // Remove leading zeros from each of the version components. 84 // Remove leading zeros from each of the version components.
85 std::string no_leading_zeros_version; 85 std::string no_leading_zeros_version;
86 std::vector<std::string> numbers; 86 std::vector<std::string> numbers = base::SplitString(
87 base::SplitString(version, '.', &numbers); 87 version, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
88 for (size_t i = 0; i < numbers.size(); ++i) { 88 for (size_t i = 0; i < numbers.size(); ++i) {
89 size_t n = numbers[i].size(); 89 size_t n = numbers[i].size();
90 size_t j = 0; 90 size_t j = 0;
91 while (j < n && numbers[i][j] == '0') { 91 while (j < n && numbers[i][j] == '0') {
92 ++j; 92 ++j;
93 } 93 }
94 no_leading_zeros_version += (j < n) ? numbers[i].substr(j) : "0"; 94 no_leading_zeros_version += (j < n) ? numbers[i].substr(j) : "0";
95 if (i != numbers.size() - 1) { 95 if (i != numbers.size() - 1) {
96 no_leading_zeros_version += "."; 96 no_leading_zeros_version += ".";
97 } 97 }
98 } 98 }
99 99
100 *parsed_version = Version(no_leading_zeros_version); 100 *parsed_version = Version(no_leading_zeros_version);
101 } 101 }
102 102
103 } // namespace content 103 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/desktop_media_id.cc ('k') | content/renderer/manifest/manifest_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698