diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 22:03:42 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 22:03:42 +0000 |
| commit | b87c4a775b5b625dc2034b70e1232862d5d7faac (patch) | |
| tree | 5e4939490ae5d5d049bc9c4ea5ccc1e70c0fb041 /chrome | |
| parent | df5f308da4fb0526f2af1fc8db24280ffcafcd6e (diff) | |
| download | chromium_src-b87c4a775b5b625dc2034b70e1232862d5d7faac.zip chromium_src-b87c4a775b5b625dc2034b70e1232862d5d7faac.tar.gz chromium_src-b87c4a775b5b625dc2034b70e1232862d5d7faac.tar.bz2 | |
base: Move StringSplitAlongWhitespace to string_split.h
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/5004002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model_unittest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/history/top_sites_database.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/themes/browser_theme_provider.cc | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index 29605ab..6d6017a 100644 --- a/chrome/browser/bookmarks/bookmark_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc @@ -12,6 +12,7 @@ #include "base/path_service.h" #include "base/string16.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_codec.h" @@ -621,7 +622,7 @@ static void PopulateNodeFromString(const std::string& description, TestNode* parent) { std::vector<std::string> elements; size_t index = 0; - SplitStringAlongWhitespace(description, &elements); + base::SplitStringAlongWhitespace(description, &elements); PopulateNodeImpl(elements, &index, parent); } diff --git a/chrome/browser/history/top_sites_database.cc b/chrome/browser/history/top_sites_database.cc index 8bfbcaf..4639494 100644 --- a/chrome/browser/history/top_sites_database.cc +++ b/chrome/browser/history/top_sites_database.cc @@ -5,6 +5,7 @@ #include "app/sql/connection.h" #include "app/sql/transaction.h" #include "base/file_util.h" +#include "base/string_split.h" #include "base/string_util.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" #include "chrome/browser/history/history_types.h" @@ -134,8 +135,8 @@ std::string TopSitesDatabase::GetRedirects(const MostVisitedURL& url) { void TopSitesDatabase::SetRedirects(const std::string& redirects, MostVisitedURL* url) { std::vector<std::string> redirects_vector; - SplitStringAlongWhitespace(redirects, &redirects_vector); - for (size_t i = 0; i < redirects_vector.size(); i++) + base::SplitStringAlongWhitespace(redirects, &redirects_vector); + for (size_t i = 0; i < redirects_vector.size(); ++i) url->redirects.push_back(GURL(redirects_vector[i])); } diff --git a/chrome/browser/themes/browser_theme_provider.cc b/chrome/browser/themes/browser_theme_provider.cc index ae40eef..c31a341 100644 --- a/chrome/browser/themes/browser_theme_provider.cc +++ b/chrome/browser/themes/browser_theme_provider.cc @@ -5,6 +5,7 @@ #include "chrome/browser/themes/browser_theme_provider.h" #include "app/resource_bundle.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extensions_service.h" @@ -361,7 +362,7 @@ std::string BrowserThemeProvider::AlignmentToString(int alignment) { // static int BrowserThemeProvider::StringToAlignment(const std::string& alignment) { std::vector<std::wstring> split; - SplitStringAlongWhitespace(UTF8ToWide(alignment), &split); + base::SplitStringAlongWhitespace(UTF8ToWide(alignment), &split); int alignment_mask = 0; for (std::vector<std::wstring>::iterator alignments(split.begin()); |