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

Unified Diff: chrome/browser/net/url_fixer_upper.h

Issue 6306011: Remove wstring from autocomplete. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/url_fixer_upper.h
===================================================================
--- chrome/browser/net/url_fixer_upper.h (revision 72388)
+++ chrome/browser/net/url_fixer_upper.h (working copy)
@@ -8,6 +8,7 @@
#include <string>
+#include "base/string16.h"
#include "googleurl/src/gurl.h"
namespace url_parse {
@@ -29,8 +30,11 @@
// Returns the canonicalized scheme, or the empty string when |text| is only
// whitespace.
std::string SegmentURL(const std::string& text, url_parse::Parsed* parts);
- // Deprecated temporary compatibility function.
+ // Deprecated temporary compatibility functions.
std::wstring SegmentURL(const std::wstring& text, url_parse::Parsed* parts);
+#if defined(WCHAR_T_IS_UTF32)
+ string16 SegmentURL(const string16& text, url_parse::Parsed* parts);
+#endif
// Converts |text| to a fixed-up URL and returns it. Attempts to make
// some "smart" adjustments to obviously-invalid input where possible.
Property changes on: chrome/browser/net/url_fixer_upper.h
___________________________________________________________________
Deleted: svn:mergeinfo

Powered by Google App Engine
This is Rietveld 408576698