diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-19 17:52:08 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-19 17:52:08 +0000 |
| commit | 2b9795cd22e721f3ab4c5ce92f7995b0e68d70df (patch) | |
| tree | 9705d5ea5030c0226a4b3c031e0bedc8bcb3f109 /chrome/browser | |
| parent | 97484ae96e972868e05378c399dca225806c36ac (diff) | |
| download | chromium_src-2b9795cd22e721f3ab4c5ce92f7995b0e68d70df.zip chromium_src-2b9795cd22e721f3ab4c5ce92f7995b0e68d70df.tar.gz chromium_src-2b9795cd22e721f3ab4c5ce92f7995b0e68d70df.tar.bz2 | |
Reverting 7304 to reapply 7296. It wasn't its fault.
Review URL: http://codereview.chromium.org/15083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/net/dns_global.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/net/dns_global.cc b/chrome/browser/net/dns_global.cc index eb8d79f..096af58 100644 --- a/chrome/browser/net/dns_global.cc +++ b/chrome/browser/net/dns_global.cc @@ -251,7 +251,7 @@ void PrefetchObserver::SaveStartupListAsPref(PrefService* local_state) { for (Results::iterator it = first_resolutions->begin(); it != first_resolutions->end(); it++) { - const std::wstring hostname = ASCIIToWide(it->first); + const std::string hostname = it->first; startup_list->Append(Value::CreateStringValue(hostname)); } } @@ -440,9 +440,9 @@ void DnsPrefetchHostNamesAtStartup(PrefService* user_prefs, for (ListValue::iterator it = startup_list->begin(); it != startup_list->end(); it++) { - std::wstring w_hostname; - (*it)->GetAsString(&w_hostname); - hostnames.push_back(WideToASCII(w_hostname)); + std::string hostname; + (*it)->GetAsString(&hostname); + hostnames.push_back(hostname); } } |