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

Side by Side Diff: chrome/browser/history/thumbnail_database.cc

Issue 12087091: Move string tokenizer to base/strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort Created 7 years, 10 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/history/thumbnail_database.h" 5 #include "chrome/browser/history/thumbnail_database.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/memory/ref_counted_memory.h" 12 #include "base/memory/ref_counted_memory.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/string_tokenizer.h"
16 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/strings/string_tokenizer.h"
17 #include "base/time.h" 17 #include "base/time.h"
18 #include "base/utf_string_conversions.h" 18 #include "base/utf_string_conversions.h"
19 #include "chrome/browser/diagnostics/sqlite_diagnostics.h" 19 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
20 #include "chrome/browser/history/history_publisher.h" 20 #include "chrome/browser/history/history_publisher.h"
21 #include "chrome/browser/history/top_sites.h" 21 #include "chrome/browser/history/top_sites.h"
22 #include "chrome/browser/history/url_database.h" 22 #include "chrome/browser/history/url_database.h"
23 #include "chrome/common/thumbnail_score.h" 23 #include "chrome/common/thumbnail_score.h"
24 #include "sql/statement.h" 24 #include "sql/statement.h"
25 #include "sql/transaction.h" 25 #include "sql/transaction.h"
26 #include "ui/gfx/image/image_util.h" 26 #include "ui/gfx/image/image_util.h"
(...skipping 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1139 } 1139 }
1140 *favicon_sizes_string = JoinString(parts, ' '); 1140 *favicon_sizes_string = JoinString(parts, ' ');
1141 } 1141 }
1142 1142
1143 // static 1143 // static
1144 void ThumbnailDatabase::DatabaseStringToFaviconSizes( 1144 void ThumbnailDatabase::DatabaseStringToFaviconSizes(
1145 const std::string& favicon_sizes_string, 1145 const std::string& favicon_sizes_string,
1146 FaviconSizes* favicon_sizes) { 1146 FaviconSizes* favicon_sizes) {
1147 bool parsing_errors = false; 1147 bool parsing_errors = false;
1148 1148
1149 StringTokenizer t(favicon_sizes_string, " "); 1149 base::StringTokenizer t(favicon_sizes_string, " ");
1150 while (t.GetNext() && !parsing_errors) { 1150 while (t.GetNext() && !parsing_errors) {
1151 int width, height = 0; 1151 int width, height = 0;
1152 parsing_errors |= !base::StringToInt(t.token(), &width); 1152 parsing_errors |= !base::StringToInt(t.token(), &width);
1153 if (!t.GetNext()) { 1153 if (!t.GetNext()) {
1154 parsing_errors = true; 1154 parsing_errors = true;
1155 break; 1155 break;
1156 } 1156 }
1157 parsing_errors |= !base::StringToInt(t.token(), &height); 1157 parsing_errors |= !base::StringToInt(t.token(), &height);
1158 favicon_sizes->push_back(gfx::Size(width, height)); 1158 favicon_sizes->push_back(gfx::Size(width, height));
1159 } 1159 }
1160 1160
1161 if (parsing_errors) 1161 if (parsing_errors)
1162 favicon_sizes->clear(); 1162 favicon_sizes->clear();
1163 } 1163 }
1164 1164
1165 } // namespace history 1165 } // namespace history
OLDNEW
« no previous file with comments | « chrome/browser/google_apis/fake_drive_service.cc ('k') | chrome/browser/importer/firefox_proxy_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698