diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 20:35:19 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 20:35:19 +0000 |
| commit | ddd231eaa03153f6d04894cceb0b4480755e1277 (patch) | |
| tree | faafed02945c1f8934e6e393ac0c6b094c303cdf /chrome/browser/browser_init.cc | |
| parent | c5e30d8572ffae1e0d4fbb2fff765f9a8cbace77 (diff) | |
| download | chromium_src-ddd231eaa03153f6d04894cceb0b4480755e1277.zip chromium_src-ddd231eaa03153f6d04894cceb0b4480755e1277.tar.gz chromium_src-ddd231eaa03153f6d04894cceb0b4480755e1277.tar.bz2 | |
Change a bunch of string types.
Started out just trying to change PrefService::GetString and ::SetString. This snowballed a little bit. Had to change a bunch of url strings in search_engines/ from wstring to string (some of them may be better off as GURLs, but UTF-8 is a step in the right direction, since that's what GURL uses internally, as well as externally via its setters/getters).
TODO (later patch): things that ask for accepted languages should use std::string, not std::wstring.
BUG=none
TEST=try bots
Review URL: http://codereview.chromium.org/2854015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 23a47be..5a4fa6c 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -836,9 +836,9 @@ std::vector<GURL> BrowserInit::LaunchWithProfile::GetURLsFromCommandLine( } const TemplateURLRef* search_url = default_provider->url(); DCHECK(search_url->SupportsReplacement()); - urls.push_back(GURL(WideToUTF8(search_url->ReplaceSearchTerms( + urls.push_back(GURL(search_url->ReplaceSearchTerms( *default_provider, value.substr(2), - TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring())))); + TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()))); } else { // This will create a file URL or a regular URL. GURL url(URLFixerUpper::FixupRelativeFile(cur_dir_, value)); |