diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 15:35:25 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 15:35:25 +0000 |
commit | e5366896e9ccb3dd17c590d115bd999e987a33af (patch) | |
tree | 52f4fc2f07b73aaca1199adb1384b123130c22ed /chrome/browser/history/history_backend.cc | |
parent | b133cc2db84fc83d5c4aa53020237788fa344c75 (diff) | |
download | chromium_src-e5366896e9ccb3dd17c590d115bd999e987a33af.zip chromium_src-e5366896e9ccb3dd17c590d115bd999e987a33af.tar.gz chromium_src-e5366896e9ccb3dd17c590d115bd999e987a33af.tar.bz2 |
Replace wstring with string16 in history. The only time wstring is used now in history is for bookmark-related stuff (the bookmarks system is still wstring-based).
The substantial change here is in RTL to make a string16 variant of the functions and in changing the WordIterator to use string16 (this cleaned up some weird utf-32 code).
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2808017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/history_backend.cc')
-rw-r--r-- | chrome/browser/history/history_backend.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index a001233..2e57b46 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -792,7 +792,7 @@ void HistoryBackend::AddPagesWithDetails(const std::vector<URLRow>& urls) { } void HistoryBackend::SetPageTitle(const GURL& url, - const std::wstring& title) { + const string16& title) { if (!db_.get()) return; @@ -1005,7 +1005,7 @@ void HistoryBackend::QuerySegmentUsage( void HistoryBackend::SetKeywordSearchTermsForURL(const GURL& url, TemplateURL::IDType keyword_id, - const std::wstring& term) { + const string16& term) { if (!db_.get()) return; @@ -1034,7 +1034,7 @@ void HistoryBackend::DeleteAllSearchTermsForKeyword( void HistoryBackend::GetMostRecentKeywordSearchTerms( scoped_refptr<GetMostRecentKeywordSearchTermsRequest> request, TemplateURL::IDType keyword_id, - const std::wstring& prefix, + const string16& prefix, int max_count) { if (request->canceled()) return; @@ -1078,7 +1078,7 @@ void HistoryBackend::UpdateDownload(int64 received_bytes, } // Update the path of a particular download entry. -void HistoryBackend::UpdateDownloadPath(const std::wstring& path, +void HistoryBackend::UpdateDownloadPath(const FilePath& path, int64 db_handle) { if (db_.get()) db_->UpdateDownloadPath(path, db_handle); @@ -1110,7 +1110,7 @@ void HistoryBackend::RemoveDownloadsBetween(const Time remove_begin, void HistoryBackend::SearchDownloads( scoped_refptr<DownloadSearchRequest> request, - const std::wstring& search_text) { + const string16& search_text) { if (request->canceled()) return; if (db_.get()) @@ -1120,7 +1120,7 @@ void HistoryBackend::SearchDownloads( } void HistoryBackend::QueryHistory(scoped_refptr<QueryHistoryRequest> request, - const std::wstring& text_query, + const string16& text_query, const QueryOptions& options) { if (request->canceled()) return; @@ -1196,7 +1196,7 @@ void HistoryBackend::QueryHistoryBasic(URLDatabase* url_db, result->set_reached_beginning(true); } -void HistoryBackend::QueryHistoryFTS(const std::wstring& text_query, +void HistoryBackend::QueryHistoryFTS(const string16& text_query, const QueryOptions& options, QueryResults* result) { if (!text_database_.get()) |