diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 18:32:30 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 18:32:30 +0000 |
| commit | 400b133f204e817bb87e357cf2cb02056f8eb0a4 (patch) | |
| tree | 7e7165352b123dc93482562e04c37131f84ae3f8 /chrome/browser/ui/browser_init.cc | |
| parent | 3705f8e68cb154810dba9f9e05b3f9fb2a9155b5 (diff) | |
| download | chromium_src-400b133f204e817bb87e357cf2cb02056f8eb0a4.zip chromium_src-400b133f204e817bb87e357cf2cb02056f8eb0a4.tar.gz chromium_src-400b133f204e817bb87e357cf2cb02056f8eb0a4.tar.bz2 | |
Remove wstring from TemplateURL and friends.
Re-landing r71485 (which was reverted in r71500).
BUG=23581
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6278007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_init.cc')
| -rw-r--r-- | chrome/browser/ui/browser_init.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 6977552..cc3ba35 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -886,8 +886,8 @@ std::vector<GURL> BrowserInit::LaunchWithProfile::GetURLsFromCommandLine( DCHECK(search_url->SupportsReplacement()); std::wstring search_term = param.ToWStringHack().substr(2); urls.push_back(GURL(search_url->ReplaceSearchTerms( - *default_provider, search_term, - TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()))); + *default_provider, WideToUTF16Hack(search_term), + TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()))); } else { // This will create a file URL or a regular URL. // This call can (in rare circumstances) block the UI thread. |