From ddd231eaa03153f6d04894cceb0b4480755e1277 Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Tue, 29 Jun 2010 20:35:19 +0000 Subject: 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 --- chrome/browser/google_url_tracker.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/google_url_tracker.cc') diff --git a/chrome/browser/google_url_tracker.cc b/chrome/browser/google_url_tracker.cc index 07748ce..b703393 100644 --- a/chrome/browser/google_url_tracker.cc +++ b/chrome/browser/google_url_tracker.cc @@ -21,8 +21,8 @@ const char GoogleURLTracker::kDefaultGoogleHomepage[] = "http://www.google.com/"; GoogleURLTracker::GoogleURLTracker() - : google_url_(WideToUTF8(g_browser_process->local_state()->GetString( - prefs::kLastKnownGoogleURL))), + : google_url_(g_browser_process->local_state()->GetString( + prefs::kLastKnownGoogleURL)), ALLOW_THIS_IN_INITIALIZER_LIST(fetcher_factory_(this)), in_startup_sleep_(true), already_fetched_(false), @@ -158,7 +158,7 @@ void GoogleURLTracker::OnURLFetchComplete(const URLFetcher* source, return; // Update the saved base URL if it has changed. - const std::wstring base_url_str(UTF8ToWide(base_url.spec())); + const std::string base_url_str(base_url.spec()); if (g_browser_process->local_state()->GetString(prefs::kLastKnownGoogleURL) != base_url_str) { g_browser_process->local_state()->SetString(prefs::kLastKnownGoogleURL, -- cgit v1.1