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/extensions/extension_updater.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/extensions/extension_updater.cc')
-rw-r--r-- | chrome/browser/extensions/extension_updater.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index 95177c6..c3b1907 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/chrome/browser/extensions/extension_updater.cc @@ -577,7 +577,7 @@ void ExtensionUpdater::ProcessBlacklist(const std::string& data) { // Update the pref value for blacklist version prefs_->SetString(kExtensionBlacklistUpdateVersion, - ASCIIToWide(current_extension_fetch_.version)); + current_extension_fetch_.version); prefs_->ScheduleSavePersistentPrefs(); } @@ -693,11 +693,10 @@ void ExtensionUpdater::CheckNow() { if (blacklist_checks_enabled_ && service_->HasInstalledExtensions()) { ManifestFetchData* blacklist_fetch = new ManifestFetchData(GURL(kBlacklistUpdateUrl)); - std::wstring version = prefs_->GetString(kExtensionBlacklistUpdateVersion); + std::string version = prefs_->GetString(kExtensionBlacklistUpdateVersion); int ping_days = CalculatePingDays(service_->extension_prefs()->BlacklistLastPingDay()); - blacklist_fetch->AddExtension(kBlacklistAppID, WideToASCII(version), - ping_days); + blacklist_fetch->AddExtension(kBlacklistAppID, version, ping_days); StartUpdateCheck(blacklist_fetch); } @@ -717,8 +716,7 @@ void ExtensionUpdater::CheckNow() { bool ExtensionUpdater::GetExistingVersion(const std::string& id, std::string* version) { if (id == kBlacklistAppID) { - *version = - WideToASCII(prefs_->GetString(kExtensionBlacklistUpdateVersion)); + *version = prefs_->GetString(kExtensionBlacklistUpdateVersion); return true; } Extension* extension = service_->GetExtensionById(id, false); |