[chromium-reviews] For system-level installs, if the spellcheck dictionary fails to get download...

chrome/browser/spellchecker.h

 // Copyright (c) 2006-2009 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_H_
 #define CHROME_BROWSER_SPELLCHECKER_H_
 
 #include <vector>
 #include <string>
 
@@ skipping 129 matching lines @@
   bool IsValidContraction(const string16& word);
 
   // Return the file name of the dictionary, including the path and the version
   // numbers.
   FilePath GetVersionedFileName(const std::string& language,
                                 const FilePath& dict_dir);
 
   static std::string GetCorrespondingSpellCheckLanguage(
       const std::string& language);
 
-  // Path to the spellchecker file.
-  FilePath bdict_file_name_;
+  // Start the dictionary download process in the file thread. On completion,
+  // this function calls on set_file_is_downloading() in the IO thread to notify
+  // that download has completed. This function has to be called in the IO
+  // thread.
+  void StartDictionaryDownloadInFileThread(const FilePath& file_name);
+
+  // The given path to the directory whether SpellChecker first tries to
+  // download the spellcheck bdic dictionary file.
+  FilePath given_dictionary_directory_;
 
   // Path to the custom dictionary file.
   FilePath custom_dictionary_file_name_;
 
   // We memory-map the BDict file.
   scoped_ptr<file_util::MemoryMappedFile> bdict_file_;
 
   // The hunspell dictionary in use.
   scoped_ptr<Hunspell> hunspell_;
 
   // Represents character attributes used for filtering out characters which
   // are not supported by this SpellChecker object.
   SpellcheckCharAttribute character_attributes_;
 
   // Flag indicating whether we've tried to initialize.  If we've already
   // attempted initialiation, we won't retry to avoid failure loops.
   bool tried_to_init_;
 
+  // The language that this spellchecker works in.
+  std::string language_;
+
 #ifndef NDEBUG
   // This object must only be used on the same thread. However, it is normally
   // created on the UI thread. This checks calls to SpellCheckWord and the
   // destructor to make sure we're only ever running on the same thread.
   //
   // This will be NULL if it is not initialized yet (not initialized in the
   // constructor since that's on a different thread.
   MessageLoop* worker_loop_;
 #endif
 
-  // Flag indicating whether we've tried to download dictionary files. If we've
-  // already attempted download, we won't retry to avoid failure loops.
-  bool tried_to_download_;
+  // Flag indicating whether we tried to download the dictionary file.
+  bool tried_to_download_dictionary_file_;
 
   // File Thread Message Loop.
   MessageLoop* file_loop_;
 
   // UI Thread Message Loop - this will be used as a proxy to access io loop.
   MessageLoop* ui_loop_;
 
   // Used for requests. MAY BE NULL which means don't try to download.
   URLRequestContext* url_request_context_;
 
@@ skipping 12 matching lines @@
 
   // Used for generating callbacks to spellchecker, since spellchecker is a
   // non-reference counted object. The callback is generated by generating tasks
   // using NewRunableMethod on these objects.
   ScopedRunnableMethodFactory<SpellChecker> dic_download_state_changer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellChecker);
 };
 
 #endif  // CHROME_BROWSER_SPELLCHECKER_H_