SpellCheck: the custom dictionary should be per profile.

chrome/browser/spellchecker/spellcheck_profile.h

 // 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.
 
 #ifndef CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_PROFILE_H_
 #define CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_PROFILE_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
+#include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/spellchecker/spellcheck_profile_provider.h"
 
 class Profile;
 class SpellCheckHost;
 class SpellCheckHostMetrics;
 
 namespace net {
 class URLRequestContextGetter;
@@ skipping 27 matching lines @@
     REINITIALIZE_CREATED_HOST,
     // An existing SpellCheckHost insntace is deleted, that means
     // the spell-check feature just tunred from enabled to disabled.
     // The state should be synced to renderer processes
     REINITIALIZE_REMOVED_HOST,
     // The API did nothing. SpellCheckHost instance isn't created nor
     // deleted.
     REINITIALIZE_DID_NOTHING
   };
 
-  SpellCheckProfile();
+  explicit SpellCheckProfile(const FilePath& profile_dir);
   virtual ~SpellCheckProfile();
 
   // Retrieves SpellCheckHost object.
   // This can return NULL when the spell-checking is disabled
   // or the host object is not ready yet.
   SpellCheckHost* GetHost();
 
   // Initializes or deletes SpellCheckHost object if necessary.
   // The caller should provide URLRequestContextGetter for
   // possible dictionary download.
   //
   // If |force| is true, the host instance is newly created
   // regardless there is existing instance.
   ReinitializeResult ReinitializeHost(
       bool force,
       bool enable,
       const std::string& language,
       net::URLRequestContextGetter* request_context);
 
   // Instantiates SpellCheckHostMetrics object and
   // makes it ready for recording metrics.
   // This should be called only if the metrics recording is active.
   void StartRecordingMetrics(bool spellcheck_enabled);
 
   // SpellCheckProfileProvider implementation.
   virtual void SpellCheckHostInitialized(CustomWordList* custom_words);
   virtual const CustomWordList& GetCustomWords() const;
   virtual void CustomWordAddedLocally(const std::string& word);
 
+  // Methods about custom dictionary.

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

nit: we do not need this comment and the blank line above because the following
functions are override ones.

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

Done.

+  virtual void LoadCustomDictionary(CustomWordList* custom_words);

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

nit: is it possible to add 'OVERRIDE' keywords to all override functions in this
class? (We also need to include "base/compiler_specific.h".)

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

Done.

+  virtual void WriteWordToCustomDictionary(const std::string& word);
+
  protected:
   // Only tests should override this.
   virtual SpellCheckHost* CreateHost(
       SpellCheckProfileProvider* provider,
       const std::string& language,
       net::URLRequestContextGetter* request_context,
       SpellCheckHostMetrics* metrics);
 
   virtual bool IsTesting() const;
 
  private:
   scoped_refptr<SpellCheckHost> host_;
   scoped_ptr<SpellCheckHostMetrics> metrics_;
 
+  const FilePath& GetCustomDictionaryPath();

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

This function should be above of |host_| to follow our coding rule:
<http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Declar...>

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

Done.

+
   // Indicates whether |host_| has told us initialization is
   // finished.
   bool host_ready_;
 
   // In-memory cache of the custom words file.
   scoped_ptr<CustomWordList> custom_words_;
 
+  // A directory path of profile.
+  FilePath profile_dir_;
+  // A path for custom dictionary per profile.
+  FilePath custom_dictionary_path_;

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

nit: can we use scoped_ptr<FilePath> to avoid allocating memory for this
variable when we do not use custom dictionaries?

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

Done.

+
   DISALLOW_COPY_AND_ASSIGN(SpellCheckProfile);
 };
 
 #endif  // CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_PROFILE_H_