diff options
| author | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 19:52:16 +0000 |
|---|---|---|
| committer | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 19:52:16 +0000 |
| commit | 753efc479384c254e263fd11390846a060fa6ce0 (patch) | |
| tree | 488097f0622c5d744059f3c2ada4894b683c5305 /chrome/browser/importer | |
| parent | 5e4d24d67febed160e2020f5c8f13d8073921fc4 (diff) | |
| download | chromium_src-753efc479384c254e263fd11390846a060fa6ce0.zip chromium_src-753efc479384c254e263fd11390846a060fa6ce0.tar.gz chromium_src-753efc479384c254e263fd11390846a060fa6ce0.tar.bz2 | |
BSD ifdefs, etc. necessary for chrome/
Review URL: http://codereview.chromium.org/656009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/firefox_profile_lock.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/importer/importer.cc | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/importer/firefox_profile_lock.cc b/chrome/browser/importer/firefox_profile_lock.cc index 4503d64..ca6935c 100644 --- a/chrome/browser/importer/firefox_profile_lock.cc +++ b/chrome/browser/importer/firefox_profile_lock.cc @@ -52,17 +52,17 @@ * ***** END LICENSE BLOCK ***** */ // static -#if defined(OS_LINUX) -// http://www.google.com/codesearch/p?hl=en#e_ObwTAVPyo/profile/dirserviceprovider/src/nsProfileLock.cpp&l=433 +#if defined(OS_MACOSX) const FilePath::CharType* FirefoxProfileLock::kLockFileName = FILE_PATH_LITERAL(".parentlock"); const FilePath::CharType* FirefoxProfileLock::kOldLockFileName = - FILE_PATH_LITERAL("lock"); -#elif defined(OS_MACOSX) + FILE_PATH_LITERAL("parent.lock"); +#elif defined(OS_POSIX) +// http://www.google.com/codesearch/p?hl=en#e_ObwTAVPyo/profile/dirserviceprovider/src/nsProfileLock.cpp&l=433 const FilePath::CharType* FirefoxProfileLock::kLockFileName = FILE_PATH_LITERAL(".parentlock"); const FilePath::CharType* FirefoxProfileLock::kOldLockFileName = - FILE_PATH_LITERAL("parent.lock"); + FILE_PATH_LITERAL("lock"); #else const FilePath::CharType* FirefoxProfileLock::kLockFileName = FILE_PATH_LITERAL("parent.lock"); diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index e903f77..d257d63 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -30,10 +30,10 @@ #include "app/win_util.h" #include "chrome/browser/views/importer_lock_view.h" #include "views/window/window.h" -#elif defined(OS_LINUX) -#include "chrome/browser/gtk/import_lock_dialog_gtk.h" #elif defined(OS_MACOSX) #include "chrome/browser/cocoa/importer_lock_dialog.h" +#elif defined(TOOLKIT_USES_GTK) +#include "chrome/browser/gtk/import_lock_dialog_gtk.h" #endif using webkit_glue::PasswordForm; @@ -456,7 +456,7 @@ void ImporterHost::ShowWarningDialog() { #if defined(OS_WIN) views::Window::CreateChromeWindow(GetActiveWindow(), gfx::Rect(), new ImporterLockView(this))->Show(); -#elif defined(OS_LINUX) +#elif defined(TOOLKIT_USES_GTK) ImportLockDialogGtk::Show(parent_window_, this); #else ImportLockDialogCocoa::ShowWarning(this); |