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/dom_ui/history2_ui.h | |
| 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/dom_ui/history2_ui.h')
| -rw-r--r-- | chrome/browser/dom_ui/history2_ui.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/dom_ui/history2_ui.h b/chrome/browser/dom_ui/history2_ui.h index 042e0c4..0ad8d2f 100644 --- a/chrome/browser/dom_ui/history2_ui.h +++ b/chrome/browser/dom_ui/history2_ui.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/string16.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/dom_ui/dom_ui.h" #include "chrome/browser/cancelable_request.h" @@ -78,7 +79,7 @@ class BrowsingHistoryHandler2 : public DOMMessageHandler, // Extract the arguments from the call to HandleSearchHistory. void ExtractSearchHistoryArguments(const Value* value, int* month, - std::wstring* query); + string16* query); // Figure out the query options for a month-wide query. history::QueryOptions CreateMonthQueryOptions(int month); @@ -86,7 +87,7 @@ class BrowsingHistoryHandler2 : public DOMMessageHandler, NotificationRegistrar registrar_; // Current search text. - std::wstring search_text_; + string16 search_text_; // Our consumer for search requests to the history service. CancelableRequestConsumerT<int, 0> cancelable_search_consumer_; @@ -102,7 +103,7 @@ class HistoryUI2 : public DOMUI { explicit HistoryUI2(TabContents* contents); // Return the URL for a given search term. - static const GURL GetHistoryURLWithSearchText(const std::wstring& text); + static const GURL GetHistoryURLWithSearchText(const string16& text); static RefCountedMemory* GetFaviconResourceBytes(); |