diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-01 20:23:22 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-01 20:23:22 +0000 |
| commit | 932289db27336277e6bab6fd48542db9cd513458 (patch) | |
| tree | 13dda07348f3b520e128d2f0d1dd8794bf8c6ef7 /chrome/browser/importer/firefox_profile_lock.h | |
| parent | 04d34f27c22ef87e38df03d5effb26c38cfb8c92 (diff) | |
| download | chromium_src-932289db27336277e6bab6fd48542db9cd513458.zip chromium_src-932289db27336277e6bab6fd48542db9cd513458.tar.gz chromium_src-932289db27336277e6bab6fd48542db9cd513458.tar.bz2 | |
Revert change 6149 because it broke the unit tests on windows.
Review URL: http://codereview.chromium.org/12834
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/firefox_profile_lock.h')
| -rw-r--r-- | chrome/browser/importer/firefox_profile_lock.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/chrome/browser/importer/firefox_profile_lock.h b/chrome/browser/importer/firefox_profile_lock.h index 8b402cf..c32d592 100644 --- a/chrome/browser/importer/firefox_profile_lock.h +++ b/chrome/browser/importer/firefox_profile_lock.h @@ -5,16 +5,11 @@ #ifndef CHROME_BROWSER_IMPORTER_FIREFOX_PROFILE_LOCK_H__ #define CHROME_BROWSER_IMPORTER_FIREFOX_PROFILE_LOCK_H__ -#include "build/build_config.h" - -#if defined(OS_WIN) #include <windows.h> -#endif #include <string> #include "base/basictypes.h" -#include "base/file_path.h" #include "testing/gtest/include/gtest/gtest_prod.h" // Firefox is designed to allow only one application to access its @@ -83,21 +78,16 @@ class FirefoxProfileLock { FRIEND_TEST(FirefoxImporterTest, ProfileLock); FRIEND_TEST(FirefoxImporterTest, ProfileLockOrphaned); - static const FilePath::CharType* kLockFileName; - - void Init(); + // The name of the lock file. + static wchar_t kLockFileName[]; // Full path of the lock file in the profile folder. - FilePath lock_file_; + std::wstring lock_file_; // The handle of the lock file. -#if defined(OS_WIN) HANDLE lock_handle_; -#elif defined(OS_POSIX) - int lock_fd_; -#endif - DISALLOW_COPY_AND_ASSIGN(FirefoxProfileLock); + DISALLOW_EVIL_CONSTRUCTORS(FirefoxProfileLock); }; #endif // CHROME_BROWSER_IMPORTER_FIREFOX_PROFILE_LOCK_H__ |