SpellCheck: the custom dictionary should be per profile.

chrome/browser/spellchecker/spellcheck_profile.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/spellchecker/spellcheck_profile.h"
 
+#include "base/file_util.h"
 #include "base/lazy_instance.h"
+#include "base/string_split.h"
+#include "base/string_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/spellchecker/spellcheck_host.h"
 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 base::LazyInstance<SpellCheckProfile::CustomWordList> g_empty_list(
     base::LINKER_INITIALIZED);
 }  // namespace
 
-SpellCheckProfile::SpellCheckProfile()
-    : host_ready_(false) {
+SpellCheckProfile::SpellCheckProfile(const FilePath& profile_dir)
+    : host_ready_(false),
+      profile_dir_(profile_dir) {
 }
 
 SpellCheckProfile::~SpellCheckProfile() {
   if (host_.get())
     host_->UnsetProfile();
 }
 
 SpellCheckHost* SpellCheckProfile::GetHost() {
   return host_ready_ ? host_.get() : NULL;
 }
@@ skipping 60 matching lines @@
   return custom_words_.get() ? *custom_words_ : g_empty_list.Get();
 }
 
 void SpellCheckProfile::CustomWordAddedLocally(const std::string& word) {
   if (!custom_words_.get())
     custom_words_.reset(new CustomWordList());
   custom_words_->push_back(word);
   if (metrics_.get())
     metrics_->RecordCustomWordCountStats(custom_words_->size());
 }
+
+void SpellCheckProfile::LoadCustomDictionary(CustomWordList* custom_words) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE) || IsTesting());
+
+  if (!custom_words)
+    return;
+
+  std::string contents;

[Hironori Bono, 2011/10/20 04:48:50]

nit: move this declaration above Line 116.

[shinyak (Google), 2011/10/20 12:04:52]

Done.

+  CustomWordList list_of_words;
+
+  file_util::ReadFileToString(GetCustomDictionaryPath(), &contents);
+  base::SplitString(contents, '\n', &list_of_words);

[Hironori Bono, 2011/10/20 04:48:50]

nit: need 'if (!contents.empty()) {' to avoid calling this function and the loop
below for empty strings.

[shinyak (Google), 2011/10/20 12:04:52]

Done.

+  for (size_t i = 0; i < list_of_words.size(); ++i) {
+    if (list_of_words[i] != "")
+      custom_words->push_back(list_of_words[i]);
+  }
+}
+
+void SpellCheckProfile::WriteWordToCustomDictionary(const std::string& word) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE) || IsTesting());
+
+  // Stored in UTF-8.
+  DCHECK(IsStringUTF8(word));
+
+  std::string word_to_add(word + "\n");
+  FILE* f = file_util::OpenFile(GetCustomDictionaryPath(), "a+");
+  if (f) {
+    fputs(word_to_add.c_str(), f);
+    file_util::CloseFile(f);
+  }
+}
+
+const FilePath& SpellCheckProfile::GetCustomDictionaryPath() {
+  if (custom_dictionary_path_.empty())
+    custom_dictionary_path_ = profile_dir_.Append(
+        chrome::kCustomDictionaryFileName);

[Hironori Bono, 2011/10/20 04:48:50]

nit: I prefer wrapping this line before 'profile_dir_.Append(' as listed in the
following snippet:
  custom_dictionary_path_ =
      profile_dir_.Append(...);

[shinyak (Google), 2011/10/20 12:04:52]

Done.

+
+  return custom_dictionary_path_;
+}