diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 23:58:49 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 23:58:49 +0000 |
| commit | 33a6db37d419babe707a987ab4a3ce7585ffa0ca (patch) | |
| tree | 5af22b159805c21aabefb40c06ccdb5d69e424e8 | |
| parent | ca2fcc26ff96aa5c9eaefffa898c5060bd722aee (diff) | |
| download | chromium_src-33a6db37d419babe707a987ab4a3ce7585ffa0ca.zip chromium_src-33a6db37d419babe707a987ab4a3ce7585ffa0ca.tar.gz chromium_src-33a6db37d419babe707a987ab4a3ce7585ffa0ca.tar.bz2 | |
Fix Firefox data import for Mac.
r58258 broke Firefox import on the Mac by trying to use a value from g_browser_process, which is not accessible in Mac out-of-process import.
Because this value isn't used or needed for the Mac build, don't even create it in the Mac version.
BUG=54265
TEST=Firefox import works on Mac again.
Review URL: http://codereview.chromium.org/3341016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58775 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/importer/firefox3_importer.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/importer/firefox3_importer.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc index 8bbba685..800f691 100644 --- a/chrome/browser/importer/firefox3_importer.cc +++ b/chrome/browser/importer/firefox3_importer.cc @@ -36,9 +36,10 @@ using importer::SEARCH_ENGINES; using webkit_glue::PasswordForm; Firefox3Importer::Firefox3Importer() { +#if defined(OS_LINUX) DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); - locale_ = g_browser_process->GetApplicationLocale(); +#endif } Firefox3Importer::~Firefox3Importer() { @@ -47,7 +48,9 @@ Firefox3Importer::~Firefox3Importer() { void Firefox3Importer::StartImport(importer::ProfileInfo profile_info, uint16 items, ImporterBridge* bridge) { +#if defined(OS_LINUX) DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); +#endif bridge_ = bridge; source_path_ = profile_info.source_path; app_path_ = profile_info.app_path; diff --git a/chrome/browser/importer/firefox3_importer.h b/chrome/browser/importer/firefox3_importer.h index 32a6a43..199b793 100644 --- a/chrome/browser/importer/firefox3_importer.h +++ b/chrome/browser/importer/firefox3_importer.h @@ -82,8 +82,11 @@ class Firefox3Importer : public Importer { FilePath source_path_; FilePath app_path_; - // Stored because we can only access it from the UI thread. +#if defined(OS_LINUX) + // Stored because we can only access it from the UI thread. Not usable + // in Mac because no access from out-of-process import. std::string locale_; +#endif DISALLOW_COPY_AND_ASSIGN(Firefox3Importer); }; |