diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 23:52:43 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 23:52:43 +0000 |
| commit | e7a5b787751ed3c1c31f66ae919f11911393b974 (patch) | |
| tree | 7627eb287c3e079a240f6cc8f98cf94c36a568b4 /chrome/browser/alternate_nav_url_fetcher.cc | |
| parent | 01b9961c2ee639c10b07624d40a73702a9f3d0ec (diff) | |
| download | chromium_src-e7a5b787751ed3c1c31f66ae919f11911393b974.zip chromium_src-e7a5b787751ed3c1c31f66ae919f11911393b974.tar.gz chromium_src-e7a5b787751ed3c1c31f66ae919f11911393b974.tar.bz2 | |
Make the autocomplete system and various other connected bits of code use GURL instead of wstring where appropriate. Original patch by phajdan.jr@gmail.com, r=me,sky. See http://codereview.chromium.org/13205 .
BUG=715234
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/alternate_nav_url_fetcher.cc')
| -rw-r--r-- | chrome/browser/alternate_nav_url_fetcher.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index 6533dba..3f058c1 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -13,7 +13,7 @@ #include "generated_resources.h" AlternateNavURLFetcher::AlternateNavURLFetcher( - const std::wstring& alternate_nav_url) + const GURL& alternate_nav_url) : LinkInfoBarDelegate(NULL), alternate_nav_url_(alternate_nav_url), controller_(NULL), @@ -97,7 +97,7 @@ std::wstring AlternateNavURLFetcher::GetMessageTextWithOffset( } std::wstring AlternateNavURLFetcher::GetLinkText() const { - return alternate_nav_url_; + return UTF8ToWide(alternate_nav_url_.spec()); } SkBitmap* AlternateNavURLFetcher::GetIcon() const { @@ -107,7 +107,7 @@ SkBitmap* AlternateNavURLFetcher::GetIcon() const { bool AlternateNavURLFetcher::LinkClicked(WindowOpenDisposition disposition) { infobar_contents_->OpenURL( - GURL(alternate_nav_url_), GURL(), disposition, + alternate_nav_url_, GURL(), disposition, // Pretend the user typed this URL, so that navigating to // it will be the default action when it's typed again in // the future. |