summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-11 00:34:12 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-11 00:34:12 +0000
commit74c8b421637393234e24b227929b89eba0883e76 (patch)
tree4d24222844a03a330142eb3210604cc4b67c4c4a /chrome/browser/profile.cc
parent3b166f49b912091f6e45e500d1617fd7609b6fe1 (diff)
downloadchromium_src-74c8b421637393234e24b227929b89eba0883e76.zip
chromium_src-74c8b421637393234e24b227929b89eba0883e76.tar.gz
chromium_src-74c8b421637393234e24b227929b89eba0883e76.tar.bz2
Change SpellChecker::Language to be an ASCII string.
Review URL: http://codereview.chromium.org/41028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
-rw-r--r--chrome/browser/profile.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 88bc072..1bc6956 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -62,6 +62,7 @@ void Profile::RegisterUserPrefs(PrefService* prefs) {
prefs->RegisterBooleanPref(prefs::kSearchSuggestEnabled, true);
prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, true);
+ // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string.
#if defined(OS_MACOSX)
// MASSIVE HACK!!! We don't have localization working yet. Undo this once we
// do. TODO(port): take this out
@@ -381,7 +382,6 @@ void ProfileImpl::InitExtensions() {
FilePath script_dir;
if (user_scripts_enabled) {
-
if (command_line->HasSwitch(switches::kUserScriptsDir)) {
std::wstring path_string =
command_line->GetSwitchValue(switches::kUserScriptsDir);
@@ -803,7 +803,8 @@ void ProfileImpl::InitializeSpellChecker(bool need_to_broadcast) {
// is being deleted in the io thread, the spellchecker_ can be made to point
// to a new object (RE-initialized) in parallel in this UI thread.
spellchecker_ = new SpellChecker(dict_dir,
- prefs->GetString(prefs::kSpellCheckDictionary), GetRequestContext(),
+ WideToASCII(prefs->GetString(prefs::kSpellCheckDictionary)),
+ GetRequestContext(),
FilePath());
spellchecker_->AddRef(); // Manual refcounting.
} else {