diff options
author | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 19:34:59 +0000 |
---|---|---|
committer | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 19:34:59 +0000 |
commit | 7075b06c4ddb77982b62ffcecb46a6c52d7860f4 (patch) | |
tree | 2f0e1f34ef05253c573b4cfbe3a7ff48fe7dfe8f /chrome/browser/spellcheck_host.h | |
parent | 37048f235367c282f1dba8c26364050dfc083d90 (diff) | |
download | chromium_src-7075b06c4ddb77982b62ffcecb46a6c52d7860f4.zip chromium_src-7075b06c4ddb77982b62ffcecb46a6c52d7860f4.tar.gz chromium_src-7075b06c4ddb77982b62ffcecb46a6c52d7860f4.tar.bz2 |
Revert 31875 to see whether it fixes reliability bot.
BUG=25677
TEST=None
Review URL: http://codereview.chromium.org/397014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/spellcheck_host.h')
-rw-r--r-- | chrome/browser/spellcheck_host.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/chrome/browser/spellcheck_host.h b/chrome/browser/spellcheck_host.h index d0bc6ee..8c2ef55 100644 --- a/chrome/browser/spellcheck_host.h +++ b/chrome/browser/spellcheck_host.h @@ -8,8 +8,8 @@ #include <string> #include <vector> +#include "base/file_descriptor_posix.h" #include "base/file_path.h" -#include "base/platform_file.h" #include "base/ref_counted.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/net/url_fetcher.h" @@ -35,7 +35,7 @@ class SpellCheckHost : public base::RefCountedThreadSafe<SpellCheckHost, // update. void AddWord(const std::string& word); - const base::PlatformFile& bdict_file() const { return file_; } + const base::FileDescriptor& bdict_fd() const { return fd_; }; const std::vector<std::string>& custom_words() const { return custom_words_; } @@ -50,14 +50,6 @@ class SpellCheckHost : public base::RefCountedThreadSafe<SpellCheckHost, virtual ~SpellCheckHost(); - // Figure out the location for the dictionary. This is only non-trivial for - // Windows: - // The default place whether the spellcheck dictionary can reside is - // chrome::DIR_APP_DICTIONARIES. However, for systemwide installations, - // this directory may not have permissions for download. In that case, the - // alternate directory for download is chrome::DIR_USER_DATA. - void InitializeDictionaryLocation(); - // Load and parse the custom words dictionary and open the bdic file. // Executed on the file thread. void Initialize(); @@ -84,7 +76,7 @@ class SpellCheckHost : public base::RefCountedThreadSafe<SpellCheckHost, Observer* observer_; // The desired location of the dictionary file (whether or not it exists yet). - FilePath bdict_file_path_; + FilePath bdict_file_; // The location of the custom words file. FilePath custom_dictionary_file_; @@ -92,8 +84,8 @@ class SpellCheckHost : public base::RefCountedThreadSafe<SpellCheckHost, // The language of the dictionary file. std::string language_; - // The file descriptor/handle for the dictionary file. - base::PlatformFile file_; + // On POSIX, the file descriptor for the dictionary file. + base::FileDescriptor fd_; // In-memory cache of the custom words file. std::vector<std::string> custom_words_; |