Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1295)

Unified Diff: chrome/browser/importer/firefox_profile_lock.cc

Issue 115133: Add import settings dialog on linux. (Closed)
Patch Set: fix mac build again Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/importer/firefox_profile_lock.cc
diff --git a/chrome/browser/importer/firefox_profile_lock.cc b/chrome/browser/importer/firefox_profile_lock.cc
index d0330020d57f5348ebbc5de0318a2e2c8ed2a5b0..f51a9f959847d79b46a21a0400dd2b4bc38ac469 100644
--- a/chrome/browser/importer/firefox_profile_lock.cc
+++ b/chrome/browser/importer/firefox_profile_lock.cc
@@ -52,8 +52,16 @@
* ***** END LICENSE BLOCK ***** */
// static
+#if defined(OS_LINUX)
+// TODO(rahulk): Even though this is called OLD_LOCK_FILE_NAME in Firefox code
+// http://www.google.com/codesearch/p?hl=en#e_ObwTAVPyo/profile/dirserviceprovider/src/nsProfileLock.cpp&l=433
+// this seems to work with Firefox 3.0.
+const FilePath::CharType* FirefoxProfileLock::kLockFileName =
+ FILE_PATH_LITERAL("lock");
+#else
const FilePath::CharType* FirefoxProfileLock::kLockFileName =
FILE_PATH_LITERAL("parent.lock");
+#endif
FirefoxProfileLock::FirefoxProfileLock(const std::wstring& path) {
Init();

Powered by Google App Engine
This is Rietveld 408576698